merge of '66eeab0bd9d407380c581368fae9d811bdf10157'
authorKoen Kooi <koen@openembedded.org>
Sun, 27 May 2007 16:15:53 +0000 (16:15 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 27 May 2007 16:15:53 +0000 (16:15 +0000)
commit1bcd28884cdf8e17ae667db24117dfd757d7654c
tree51649b69ef8f394377b5676ce1137ee77c34fb4c
parentb6ab1136421d7dfe3633b772a6eaeced601d839c
parent49cc9f5f34beec3014df78590d549632349fc2cf
Merge ... '66eeab0bd9d407380c581368fae9d811bdf10157'
     and '7e6a6b9438e8ed84e7dcabbf95517f9dba2ba6e6'