merge of '0ff008433fa51cf7039bcbbf1ad8f7ca56f1598c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 21 Aug 2007 10:05:09 +0000 (10:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 21 Aug 2007 10:05:09 +0000 (10:05 +0000)
     and '228a037630b37b507f3933f6eb058c47f559fb75'


Trivial merge