merge of '608ac63921c4d1a58f52ff5666e33b863be0d5e2'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 14 Mar 2007 14:04:59 +0000 (14:04 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 14 Mar 2007 14:04:59 +0000 (14:04 +0000)
commit9786a54c79e5f9ec7d987896643443bb04d93a54
tree7c1d04df0b328de52e113ff42ada8e96ea3fdc92
parentb96872238088830e5ac8f166895de579ccb40c67
parent85ea813f98987b6819ee0e81a4ddc9d1aa002915
Merge ... '608ac63921c4d1a58f52ff5666e33b863be0d5e2'
     and 'fbd5ff3ff37128ffc8addc9ff281a91c38bc6119'