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)
commit8ae098ac7348611935439c2ebc61c9165b046a9e
treefbd485a58aa07662c9ae5aed07ea5e9b3d38976a
parent68c4acbeeedda4db03576b46f5b1ef3ff44e10d9
parent121b90021e9e876dc582f448781211e938869651
merge of 60da1de31387d235b99e99c95290e2f845e6d0b0
     and e4bf98913631900c38f8f05d74d0f47a2a231a60