merge of '9a2dacaa07f0fa0d6e2645ce797391f52e2608e1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 May 2008 15:41:33 +0000 (15:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 May 2008 15:41:33 +0000 (15:41 +0000)
     and 'faf8b98d3258fe272efb4ed0c6d22cd1f32c6593'


Trivial merge