merge of '471af30b8adb13fb7681f57fbf429fee02749677'
authorKoen Kooi <koen@openembedded.org>
Fri, 16 Feb 2007 11:57:17 +0000 (11:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 16 Feb 2007 11:57:17 +0000 (11:57 +0000)
     and 'c75dc8320db6dd7f35c858791b148fbb1200f82c'


Trivial merge