merge of '7123aeb50a120a6a5370c2a906821b0d823accb7'
authorKoen Kooi <koen@openembedded.org>
Sat, 7 Apr 2007 19:11:23 +0000 (19:11 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 7 Apr 2007 19:11:23 +0000 (19:11 +0000)
commit0440310e17dc15f81bb316843a589a35eaf624f4
treedffdf002e97640697f458e6d7abfc4a4d3197cb7
parent449aa15a1e9ee3343ecf6581ec53aca24c17ab21
parent14d985a574cd3a11d25305a79c39614e262771e8
Merge ... '7123aeb50a120a6a5370c2a906821b0d823accb7'
     and 'b01e3a89520186860b956deb0a09c2291cfc5705'