merge of '1044732b8a88225ade87ce8064bd97dee00124ac'
authorKoen Kooi <koen@openembedded.org>
Wed, 3 Sep 2008 12:45:31 +0000 (12:45 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 3 Sep 2008 12:45:31 +0000 (12:45 +0000)
commita15ed9ffce6d23ff06fcea5712694a778680c245
tree35e4df454f2a87681f90b9d4dcc54099fa054078
parenta91d36ab71dc62c24699a04ae807b9314e127522
parent543721ec95621f1b5cb57703d8a52b16bf6041d4
Merge ... '1044732b8a88225ade87ce8064bd97dee00124ac'
     and '462295240b0a06ab1c367eb883ec218b4313bf89'