merge of '58a64bc4f0e9295e4e68eaf15495ee2eb9e6fbd8'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 23 Jan 2008 15:30:47 +0000 (15:30 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 23 Jan 2008 15:30:47 +0000 (15:30 +0000)
     and '72f985b233bd7f6a6cccf8ae78b46faac96fd50a'


Trivial merge