merge of '9b6c5160cff651f4a9456777e0128466a236ebe4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 15 May 2007 11:57:32 +0000 (11:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 15 May 2007 11:57:32 +0000 (11:57 +0000)
     and 'a4859537da343f2db1d20f9d26c0a20fd655ddbe'


Trivial merge