merge of '1a0381ff4565808f58609382d1280e18d59ded7f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jul 2008 13:56:57 +0000 (13:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jul 2008 13:56:57 +0000 (13:56 +0000)
     and '82db3fe8864d686473c6bbf5db186f5fcbc90c5f'


Trivial merge