merge of '75cc5b6d101abaa6d3152ecabd66113e3524b48f'
authorKoen Kooi <koen@openembedded.org>
Sat, 4 Aug 2007 15:49:52 +0000 (15:49 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 4 Aug 2007 15:49:52 +0000 (15:49 +0000)
     and '97361f57055487168df642f2260c940cb3b6da7f'


Trivial merge