merge of '365d8f133c3f7699978ee00c41919fac8d53bd47'
authorKoen Kooi <koen@openembedded.org>
Fri, 20 Oct 2006 12:30:29 +0000 (12:30 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 20 Oct 2006 12:30:29 +0000 (12:30 +0000)
     and '8ce31384f7196aabf3284f45ea6f9fc66d2c49ba'


Trivial merge