merge of 'ba75ce699520265ea15b201913787870af7e0572'
authorKoen Kooi <koen@openembedded.org>
Fri, 20 Oct 2006 13:15:17 +0000 (13:15 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 20 Oct 2006 13:15:17 +0000 (13:15 +0000)
     and 'f535484a11d9a7f9de067f6f66a12a8e321e6a0b'


Trivial merge