merge of '011ea838b318e8da2d5c0f2a9d9a8a41c2096ceb'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 17 May 2008 19:55:06 +0000 (19:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 17 May 2008 19:55:06 +0000 (19:55 +0000)
     and 'ed0aa1600b77c27c385bdb61f6e9728aa499015b'


Trivial merge