merge of '7aa7b871e61134447284942ec350d93a3044f8af'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Mar 2007 10:46:43 +0000 (10:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Mar 2007 10:46:43 +0000 (10:46 +0000)
commitce58a2c99799900cab6be3ba20af3dbfb5e3f9d9
treeffcc8d61b70e9c9d401b811df83761ec4852773d
parente429e9bd6215332d5a0250ea77edcf8adbf13d99
parent02b6a802e07f7266a6759a9e9879f2568fdba24b
Merge ... '7aa7b871e61134447284942ec350d93a3044f8af'
     and '8bbf0e2d12fda9e596e7a83c9167f4cd4ad63790'