merge of '5ccab19e0abd27e8128d91da533c52656df39aa3'
authorKoen Kooi <koen@openembedded.org>
Thu, 2 Aug 2007 10:11:15 +0000 (10:11 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 2 Aug 2007 10:11:15 +0000 (10:11 +0000)
     and 'a422d794d754d9fd6d61b55a92e48c2dd601ba08'


Trivial merge