merge of '3b5424db9b8ce0b7d550ad80e57b9462b0de36f8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jun 2008 21:56:08 +0000 (21:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jun 2008 21:56:08 +0000 (21:56 +0000)
     and '779cae4a07162d76a1d0ec8366a1e35442716ab1'


Trivial merge