merge of '95849379549ff4dd11d6dd203053b1bd43f8ab26'
authorKoen Kooi <koen@openembedded.org>
Mon, 27 Aug 2007 12:57:26 +0000 (12:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 27 Aug 2007 12:57:26 +0000 (12:57 +0000)
     and 'fd79f1d31b405d2489723f78bb2e2479e44b0e5b'


Trivial merge