merge of '4c92946353f7eca594c80ecf9ca6eda68f9a4b1d'
authorKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 10:59:30 +0000 (10:59 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 10:59:30 +0000 (10:59 +0000)
     and 'd9028008b81ee7dc03222c59a45df67dfe24a09c'


Trivial merge