merge of '7aa7b871e61134447284942ec350d93a3044f8af'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Mar 2007 10:46:43 +0000 (10:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Mar 2007 10:46:43 +0000 (10:46 +0000)
     and '8bbf0e2d12fda9e596e7a83c9167f4cd4ad63790'


Trivial merge