merge of '7cea498c89cd9f4506bd1ed4ce852d868e4e299f'
authorKoen Kooi <koen@openembedded.org>
Fri, 14 Mar 2008 11:48:39 +0000 (11:48 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 14 Mar 2008 11:48:39 +0000 (11:48 +0000)
commit021639e725c8575eb496459c072878385dc02de8
treef3e87eb7e3c49ab92648ca3a8c4f42f1d654bf2a
parentf27d939066c320621c1af8d6998f45d07857bfae
parent38f043287062cea233c11755c111b4a7dfb28d79
Merge ... '7cea498c89cd9f4506bd1ed4ce852d868e4e299f'
     and '8ee8043c51d4de884f7d0da4c909abebb6e6356f'