merge of '3889e1126647417898dfc189538f194f3cf760fb'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 24 May 2008 13:20:46 +0000 (13:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 24 May 2008 13:20:46 +0000 (13:20 +0000)
     and '6ba3477131d507125b7da775792be1ddb5bdf90c'


Trivial merge