merge of '47b75b678cf4bede24082e551e04f186734a008c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 5 Feb 2008 13:34:45 +0000 (13:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 5 Feb 2008 13:34:45 +0000 (13:34 +0000)
     and '647847c7187d536c71adab58568757d34b048ac2'


Trivial merge