merge of '4f32005a985543bea4ff090bb1bc2b31df62ac89'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 23 May 2007 15:07:36 +0000 (15:07 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 23 May 2007 15:07:36 +0000 (15:07 +0000)
     and 'cd57d1ebc0ab6f1982195cae243401d5bd970b9a'


Trivial merge