merge of '38bc1cc48b4168ea2aafb31b0de856f57a0625b2'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 1 May 2007 17:37:55 +0000 (17:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 1 May 2007 17:37:55 +0000 (17:37 +0000)
     and 'bc8cfed5e37f251070c62f9cef49b1db7aa86264'


Trivial merge