merge of '1c4ee14296c98438edf9aebdbe655db562583e52'
authorKoen Kooi <koen@openembedded.org>
Wed, 16 May 2007 10:58:08 +0000 (10:58 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 16 May 2007 10:58:08 +0000 (10:58 +0000)
     and '6f56c7d82482d2097d9668c7a97af22ea3e644b8'


Trivial merge