merge of '23575cb366ac6706d85f4cc91b22f06ce1e10a0d'
authorKoen Kooi <koen@openembedded.org>
Thu, 2 Oct 2008 11:26:22 +0000 (11:26 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 2 Oct 2008 11:26:22 +0000 (11:26 +0000)
commit5409a0e65ec89118622d9c8b85ae81bd4eeea01d
tree7dbdd9584a20ba14bcc8d6e81e3b147865890998
parent0d2076ed8e2a9566573bc16db2ada8a01fa1db29
parente2811fa331c29f91a088bee958ce483d92464b6d
Merge ... '23575cb366ac6706d85f4cc91b22f06ce1e10a0d'
     and 'd6babd021e3bde4e1d827d07c1af7154a6569ab7'