merge of 'a20b528579d5908635ab78e38cfc45339051c775'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 29 Aug 2007 12:05:59 +0000 (12:05 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 29 Aug 2007 12:05:59 +0000 (12:05 +0000)
     and 'e37c01e1704cbba064751264442c502dfe81db47'


Trivial merge