merge of 60da1de31387d235b99e99c95290e2f845e6d0b0
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Wed, 28 Jun 2006 22:57:45 +0000 (22:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 28 Jun 2006 22:57:45 +0000 (22:57 +0000)
     and e4bf98913631900c38f8f05d74d0f47a2a231a60


Trivial merge