merge of '243cf387e20ff4eee94397f00dfc3e8dd9273515'
authorKoen Kooi <koen@openembedded.org>
Sat, 16 Jun 2007 14:58:58 +0000 (14:58 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 16 Jun 2007 14:58:58 +0000 (14:58 +0000)
     and '9a35230d2a8469b73580eda5b24e03de17360499'


Trivial merge