merge of '4ced2a6d71f9eeefb5a83f0584348d666b56065a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 9 Jul 2008 19:35:07 +0000 (19:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 9 Jul 2008 19:35:07 +0000 (19:35 +0000)
     and '9a6c7bec4be483b56e6305d978adce9e49f1e29c'


Trivial merge