merge of '3f551b06dbb61a62224fe6d9f3affb063932e0f1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 Sep 2008 19:01:26 +0000 (19:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 Sep 2008 19:01:26 +0000 (19:01 +0000)
commit97b021ece5247b0a0956b63ad8830f20d67eaab2
tree4c959538a26170d5f115b341a2aae3d62a7cce1b
parent13af66b4f973bf0b2e842b1024048371e29e1532
parentad97d12cc7b2d1da6bc6b0d56f3e3a559ad967e1
Merge ... '3f551b06dbb61a62224fe6d9f3affb063932e0f1'
     and 'b06c292fe0a6222355b7b5337759a187eafa372b'