merge of '0a9f655b4113fe8e3bfe6ae45053cebe0c2a0ee8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 15 Sep 2007 06:12:43 +0000 (06:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 15 Sep 2007 06:12:43 +0000 (06:12 +0000)
     and 'abaaa429d4020daefbea346a2ce406cbeb6def5e'


Trivial merge