merge of 0248315b9fe761433566e0707c8fbad66689a3af
authorKoen Kooi <koen@openembedded.org>
Thu, 27 Apr 2006 14:48:46 +0000 (14:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 27 Apr 2006 14:48:46 +0000 (14:48 +0000)
commit220cace8b7456e588cd4b9fe4052930e68cf5b81
treed38cec215b2a79926ef6d01401bf45c332a8df89
parent8e260c1c32d36bfc13fc2280d3b7f9b5c119401e
parentb69f270795075fa96879d0129a14a74691e2059d
merge of 0248315b9fe761433566e0707c8fbad66689a3af
     and 060d946096395a1f0639f18f63d678fe52f718bd