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)
     and '7e6a6b9438e8ed84e7dcabbf95517f9dba2ba6e6'


Trivial merge