merge of 'b0f2b6b66673367e2119e54761590a724c20c2e1'
authorKoen Kooi <koen@openembedded.org>
Sun, 17 Jun 2007 10:25:34 +0000 (10:25 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 17 Jun 2007 10:25:34 +0000 (10:25 +0000)
     and 'd4199b222eb8c2755fae3eefe9fdbd225e6d9e81'


Trivial merge