FYI, this patch should beFrom: Ming Lin <ming.l@ssi.samsung.com>unfortunately git is really eager to lose these when having the slightestconflicts in a rebase..