merge of '189bf0db22327cd99864022fed3f4e85c98cde72'
authorKoen Kooi <koen@openembedded.org>
Mon, 7 May 2007 17:56:50 +0000 (17:56 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 7 May 2007 17:56:50 +0000 (17:56 +0000)
commit8fd5db08db6f84a1818721af9e4269f9a404ea25
treeaf64312f1a0af3f61f2811023f672666b81ce18e
parentfb01830e8e9b67757c41c31b547fc7d39ff7778d
parentb5c35fad6b345e26547421f614fc2ac5a1f54cf6
Merge ... '189bf0db22327cd99864022fed3f4e85c98cde72'
     and 'adb2b82ee900910b01239587279ad8cbd3f6b150'