merge of '20460ca5bc208d9dfe0693cc79f9684c01aef89d'
authorKoen Kooi <koen@openembedded.org>
Thu, 18 Sep 2008 08:08:13 +0000 (08:08 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 18 Sep 2008 08:08:13 +0000 (08:08 +0000)
     and '47719692fbdea0a9908a2b8c86858fe92ce97e1e'


Trivial merge