merge of '0cf8f2c5ee855d39a6405f986c68c060c315c548'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 Oct 2007 13:42:57 +0000 (13:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 Oct 2007 13:42:57 +0000 (13:42 +0000)
     and '4f77470c64f631cf18c5d73d963e41e28fe097bb'


Trivial merge