merge of 6c5f6dd92dc9e167c3598305801931820379802a
authorJamie Lenehan <lenehan@twibble.org>
Thu, 15 Jun 2006 07:46:04 +0000 (07:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Jun 2006 07:46:04 +0000 (07:46 +0000)
     and dbb4f8c5ce9d6875e4b652532e08c39932325b64


Trivial merge