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)
commit97e1d6538b1f7396b13ac9cd14fb8092b26fb712
treec53fa45f2b5800ecd7eb6fdc60ff44e649e3a10a
parentb8a549e23060211a6d0a87a74600507846385a4f
parentf83efeed49a3d39a4313c966d064c8812086babc
merge of 8c16cdbfd0fc7d55498a7ffc0a2e64b24025460d
     and f1c9afde058f9dacdf29b67d8609495aef4205f5