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)
commit912c169eb28b8b95b2c7cc7c26d5be8027245a61
treeb7a05f36e3f0b4cce0b2e73e4d4c458bbb56333b
parentc099e120c652a37a13868cbd3a2e371fce44cc48
parent453a78aecefc9e7befce89d42b83dd51c1db6cd7
Merge ... '06afba065baa0aa6cc772fb60024fa37cb131af1'
     and '5995a83d0430a8edc5974f2cfce4c4bf1150fb1e'