merge of '13509c938fd1a99107093b57954661739e7c0d13'
authorKoen Kooi <koen@openembedded.org>
Sun, 17 Jun 2007 10:48:13 +0000 (10:48 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 17 Jun 2007 10:48:13 +0000 (10:48 +0000)
     and 'ccf6618308437769e6e810b1fa60e3d0e565e1dd'


Trivial merge