merge of '9fbffdcb9794d661ec2be0360be70be480cdaf93'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 14 Apr 2007 11:17:43 +0000 (11:17 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 14 Apr 2007 11:17:43 +0000 (11:17 +0000)
     and 'f0746e43aaebc1cf80256d1678906f3942922829'


Trivial merge