merge of '685f9c2bb963e57e2c7abc168ebc9bcb6c773b02'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 10 Aug 2007 14:02:03 +0000 (14:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 10 Aug 2007 14:02:03 +0000 (14:02 +0000)
     and 'f9a0a31057fa5ef412d342dce9c8933a0bcf3c1b'


Trivial merge