merge of '0c6f4fed33f17c5c3b0e7416ecda652fda206d63'
authorKoen Kooi <koen@openembedded.org>
Thu, 15 May 2008 07:22:21 +0000 (07:22 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 15 May 2008 07:22:21 +0000 (07:22 +0000)
     and 'aa3097d17325c17ff5fe04479d9a3a47ec96d299'


Trivial merge