merge of '4be62db5e8ff5d5cad0e43cd8487d753ab05b5db'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 30 May 2007 13:28:04 +0000 (13:28 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 30 May 2007 13:28:04 +0000 (13:28 +0000)
commitb4bf98b0efcdd1ba0939488e8e026d7dc5084951
treead51e49aa3b6da6dc4b5588fabd8f6f0a67d9193
parent93455e1a52321f3325626d04f0892d8f92662b22
parent31fb355a9baa325a90873fafa7dd2a1f67de1970
Merge ... '4be62db5e8ff5d5cad0e43cd8487d753ab05b5db'
     and '9f8cf61e9a8cc62317c12ec79fb40a6685030bc3'