merge of '27baa018f9f9e77156f5eb95353722f773cc651d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 22 Aug 2007 20:31:50 +0000 (20:31 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 22 Aug 2007 20:31:50 +0000 (20:31 +0000)
     and 'a61caf645adcb41a0f8ba344818d237040ae0bc9'


Trivial merge