merge of '0e55c1c0e1e6a5361923fc36b9af9f761d3f5b54'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 15 Jan 2008 23:29:01 +0000 (23:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 15 Jan 2008 23:29:01 +0000 (23:29 +0000)
     and 'c0856cf5b6ece74a7274429e466e6b5c3672ab1d'


Trivial merge