merge of '48173d5e9ba6b9c01006caf0faeedb090a20d0d1'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 4 Jul 2007 07:15:21 +0000 (07:15 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 4 Jul 2007 07:15:21 +0000 (07:15 +0000)
     and 'f3281034536642327c1e507cb7559b3899f99d18'


Trivial merge