merge of '47d594be43a773db8f35b058cc2d3113cb26f441'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 16 Oct 2006 13:47:22 +0000 (13:47 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 16 Oct 2006 13:47:22 +0000 (13:47 +0000)
commita2635f262e420e3541fdf53766a558114fee96f5
treee8b98fac1e8994ccb78f68a52ef2ed5b6cb2e652
parent37a9fc1442f53c519f5c10967b2b018926d1b32e
parentf99a4d32a4152d92c296a76ea526140ecc04812e
Merge ... '47d594be43a773db8f35b058cc2d3113cb26f441'
     and '66e89031d52c1b27eb48a89e6155eb9ed5dc352e'