merge of '3b746059b417b5f4dac35b18e315cd86005e0bad'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 Oct 2007 08:29:58 +0000 (08:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 Oct 2007 08:29:58 +0000 (08:29 +0000)
commit83be7b90f5f7f4f8cf55070ce22ac8e29bcca1d3
treeb0be733764553b307c8b3dd6f71d5a608a4be97f
parent1a4520ea937ba716904eacf196575d6f7ebe6e50
parentca914bc4804bf812c1f61350f6487bc60f48b25a
Merge ... '3b746059b417b5f4dac35b18e315cd86005e0bad'
     and '6eb4738f8e16e760c646d20625cb8c9069e25c22'