merge of '92c05bc0b6ee1645537e1189be26b9962a1c5170'
authorKoen Kooi <koen@openembedded.org>
Sun, 13 Apr 2008 12:29:49 +0000 (12:29 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 13 Apr 2008 12:29:49 +0000 (12:29 +0000)
commitdc4d88e6614cb224048077480e5f8e57436ac50b
tree4943f53e62b2c121779213cec28812bbf5244d4b
parent669b27624bb05304372159d72e5691b185205b37
parentb4804b9510c47cac341a3577efe297db3dc65df6
Merge ... '92c05bc0b6ee1645537e1189be26b9962a1c5170'
     and 'b4c276c777f8614628c038c3f75fb35493df20b7'