merge of '00387596010fb456e9ddb8c5fc00779ab58ef9b2'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 Jan 2007 21:53:14 +0000 (21:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 Jan 2007 21:53:14 +0000 (21:53 +0000)
     and '603695e69a919842f2105d9fe3ad853c1f0ea386'


Trivial merge