merge of '6e562962e9bd825d825465d312524f84e3e493a4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 May 2008 09:04:43 +0000 (09:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 May 2008 09:04:43 +0000 (09:04 +0000)
commite91a812ac4a6b1dd9d3cd9aef1f87c33deaa5085
tree2d25e5b146af7a9c049ed63a5f34f4c0d4f086a8
parent197bd064d5e8e08e8d3112a7765d5147da1b3e3a
parent1b93a70cb2f9d93d3344f779a5d0a0c241d243e1
Merge ... '6e562962e9bd825d825465d312524f84e3e493a4'
     and 'b0881da09ca99de633f27df620ac1f8e8250f288'