merge of '3ab13564266d48c610004a9570479df65c0ee659'
authorKoen Kooi <koen@openembedded.org>
Wed, 10 Oct 2007 09:15:35 +0000 (09:15 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 10 Oct 2007 09:15:35 +0000 (09:15 +0000)
     and '5ac8d930d208290aa8f5f13dd67120ed845441ed'


Trivial merge