merge of '313f55e5f9f09b07e1ed5f50011e51c1c6acb73c'
authorKoen Kooi <koen@openembedded.org>
Wed, 10 Oct 2007 09:41:40 +0000 (09:41 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 10 Oct 2007 09:41:40 +0000 (09:41 +0000)
     and 'dbb53fe45696a4f12d4e96c449c65f691e0e8346'


Trivial merge