merge of '71a6f5cc95d96aa5be61904d011fd4dcb8f968cb'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 May 2008 10:57:51 +0000 (10:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 May 2008 10:57:51 +0000 (10:57 +0000)
     and 'b2e500e4b850630068400cee09253779d13dba03'


Trivial merge