merge of '020488f3ba9e81e4178652d978f708c79e8d7e01'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 5 Sep 2007 08:50:24 +0000 (08:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 5 Sep 2007 08:50:24 +0000 (08:50 +0000)
     and '1ffb54e79b9df71a0ee9e03df1052efbedd65396'


Trivial merge