merge of 'a3ceb2efe11ba0ea4109c98e325782ecb5291f36'
authorKoen Kooi <koen@openembedded.org>
Thu, 25 Sep 2008 18:58:21 +0000 (18:58 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 25 Sep 2008 18:58:21 +0000 (18:58 +0000)
     and 'e474c45d11742eae32d0f0be8f321dd5a162f101'


Trivial merge