This is a backport from Eric Miao's patchset. git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3826 311d38ba-8fff-0310-9ca6-ca027cbcb966