merge of 'ad632a7eb7f054624190b7f4503868e9c174c9b6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 22 Aug 2007 09:02:46 +0000 (09:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 22 Aug 2007 09:02:46 +0000 (09:02 +0000)
     and 'ba5f0bfd65d0f4a53bb92b3488758f3be847e612'


Trivial merge