merge of '5c7cb8a0cf72b57be73ae08b5e625eecf68c3969'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Jun 2007 13:21:29 +0000 (13:21 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Jun 2007 13:21:29 +0000 (13:21 +0000)
commitb655c71aac44af6eab2a52774ea810a945592cee
treec50f34a595a58cb31a25d96727c3e2c9c27c0a91
parentab53023c622a7f1e7c57ea0da90a595b09b84d5c
parenteb2affaeeed8c2c6c407bf2181b1d873f9c7e1e8
Merge ... '5c7cb8a0cf72b57be73ae08b5e625eecf68c3969'
     and '97b9d760b9a9eeeb209e06acb82d7303aec3bf7b'