merge of '2c8930a5e3dfc1e355f0dede8fde6b887e2d33de'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 15:57:13 +0000 (15:57 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 15:57:13 +0000 (15:57 +0000)
commitc365f60cbcfd55c56a5a414cc3951773832da35e
tree100378f3fc21a4d8ac9e0bc63c338893ed55e09c
parentabcb81efda9e55f18e9c782aebd93f067e592be5
parentd1b1c754d72fcaf47d9b312450c07ba200c22d8c
Merge ... '2c8930a5e3dfc1e355f0dede8fde6b887e2d33de'
     and 'cf2bb56e5f6bd283e65c7bf7c89c86e77dbd1fb0'