merge of '4ceb0ef60a086087bfe7a232b07d6fb71c3ccd04'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 22 Aug 2007 17:01:20 +0000 (17:01 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 22 Aug 2007 17:01:20 +0000 (17:01 +0000)
     and 'eaf6fede3ee9af7cea4d430e426ee09da45e8f21'


Trivial merge