merge of '2c0fad768939f606b65e1c9b4e1220f0209883f7'
authorKoen Kooi <koen@openembedded.org>
Wed, 8 Aug 2007 06:20:51 +0000 (06:20 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 8 Aug 2007 06:20:51 +0000 (06:20 +0000)
commitbf0561f41898b938a6f772a4006a113bbf51393a
tree6c7b66e58faf7d7c5424c719dbf126b60886168f
parentcd2d22bec1fb2d5bb2d64af90dc93f0efa939be4
parent8e0edca59aa429e14f33632942ce2743dfff62ce
Merge ... '2c0fad768939f606b65e1c9b4e1220f0209883f7'
     and 'c441a97d0a545c68ad7de39b4729d857ef08723c'