merge of '3a476b00537a64a6add8bd114705a5f82eb6eef4'
authorKoen Kooi <koen@openembedded.org>
Tue, 1 Apr 2008 10:30:35 +0000 (10:30 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 1 Apr 2008 10:30:35 +0000 (10:30 +0000)
commite9610a64465aa531182bd742996f37ae8414e678
tree6aa5b0ea448c0cf6a1b652f243e4c63e16ec0bc5
parenta8e27c7b7c14f6e73c9bafc797b03b6f41656635
parentf57b3a92a59ac7a0826ed163f7d832106d718616
Merge ... '3a476b00537a64a6add8bd114705a5f82eb6eef4'
     and 'a969c8d5435c04a5d12f8d650d864e12384c7c28'