merge of '545fbb481fb86e841b1362914cceb6638930d7ee'
authorKoen Kooi <koen@openembedded.org>
Thu, 14 Jun 2007 08:04:02 +0000 (08:04 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 14 Jun 2007 08:04:02 +0000 (08:04 +0000)
     and 'b3b0a8850deffddd2c3a43b7bc7c142279e70463'


Trivial merge