merge of '8f2c3c8fa725eadc5ae26c7316aa404636f58ad4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 28 Jul 2007 18:32:14 +0000 (18:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 28 Jul 2007 18:32:14 +0000 (18:32 +0000)
     and 'f4ee8a6396717740a1e631355d0789d10ed8add0'


Trivial merge