merge of '4ea5971c2dd26e9c357b906128f0e339d80e3d50'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 31 Jan 2008 21:24:36 +0000 (21:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 31 Jan 2008 21:24:36 +0000 (21:24 +0000)
commitb20edcd38445574cbdd667d5e82fb59572e4cab2
tree5a52d1265144694e035f2087d0495c83b69f5c9a
parent64529f883fb70f97a28cb8fe082fb7b357d509d9
parentd8918d114e1286ff97435a543b65d270e79a0f92
Merge ... '4ea5971c2dd26e9c357b906128f0e339d80e3d50'
     and 'e651c4fa9a5d1fc6120cc2309e9cba1388cecc52'