merge of 'f48ac043926352f44cb734d06f001be6e51080ef'
authorKoen Kooi <koen@openembedded.org>
Tue, 9 Jan 2007 13:04:53 +0000 (13:04 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 9 Jan 2007 13:04:53 +0000 (13:04 +0000)
     and 'fcd003eb4fa8060fd6075794e36115f1b96f4bf8'


Trivial merge