merge of 8c16cdbfd0fc7d55498a7ffc0a2e64b24025460d
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Wed, 5 Jul 2006 16:18:51 +0000 (16:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 5 Jul 2006 16:18:51 +0000 (16:18 +0000)
     and f1c9afde058f9dacdf29b67d8609495aef4205f5


Trivial merge