merge of '26245e99077b235e93972cec78f5b1d81619d8b9'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 Jan 2007 16:07:16 +0000 (16:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 Jan 2007 16:07:16 +0000 (16:07 +0000)
     and 'e60c1cfca0f9542d72d19b149aa9b423b5656afa'


Trivial merge