merge of '06afba065baa0aa6cc772fb60024fa37cb131af1'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 28 May 2007 13:27:19 +0000 (13:27 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 28 May 2007 13:27:19 +0000 (13:27 +0000)
     and '5995a83d0430a8edc5974f2cfce4c4bf1150fb1e'


Trivial merge