merge of fb384f800bdb59aeed9d7bff06f6fa477bb6ddd6
authorRichard Purdie <rpurdie@rpsys.net>
Wed, 14 Jun 2006 23:58:34 +0000 (23:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 14 Jun 2006 23:58:34 +0000 (23:58 +0000)
     and dbb4f8c5ce9d6875e4b652532e08c39932325b64


Trivial merge