merge of 'd85165b6d72282ba94622c1c0d0c9c3e4a6be821'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jun 2007 14:50:26 +0000 (14:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jun 2007 14:50:26 +0000 (14:50 +0000)
     and 'e5325ab8e47ca7688fb1a8e72b249d38ff3a7b4c'


Trivial merge