merge of '3b2a4c2d157c55e28c1c710b49f9431e03679512'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 30 May 2007 11:33:08 +0000 (11:33 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 30 May 2007 11:33:08 +0000 (11:33 +0000)
     and '4181e4eed80d3a599e70d00eb9af3049382b8f62'


Trivial merge