merge of 2688bfa9b672d5b4d8734a288aa8b1e77ee47a60
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Wed, 28 Jun 2006 23:02:09 +0000 (23:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 28 Jun 2006 23:02:09 +0000 (23:02 +0000)
     and 451e0728f5380a834da5ad8ecd79994cf6f12315


Trivial merge