merge of '92b50128e188e5fefd038726a401a9de2dd1ef56'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 May 2008 19:03:24 +0000 (19:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 May 2008 19:03:24 +0000 (19:03 +0000)
     and 'ca639ce6da41e90a150a4efd5a0738273cd10607'


Trivial merge