merge of '5f21c437aa0fff306d71bc8a8df1b5108b220a05'
authorKoen Kooi <koen@openembedded.org>
Tue, 7 Nov 2006 12:19:58 +0000 (12:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 7 Nov 2006 12:19:58 +0000 (12:19 +0000)
commitc124c2ab24a82182ed6c1d6f63e9d55aa3db2994
tree789efb35d9a6c8221123f68fd05e879c2c073b2e
parentb9c6bb658a75ebf151102aedf7f5b7067127b44a
parent5f65d68de33fbdf2100d62f69eb28887cd261e54
Merge ... '5f21c437aa0fff306d71bc8a8df1b5108b220a05'
     and '9bb2161deb1eda6a77ebfd26459243bc0120aeae'