merge of '09c9ae46a929db4ad083caeb38025cd7068a7668'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Apr 2008 14:23:17 +0000 (14:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Apr 2008 14:23:17 +0000 (14:23 +0000)
commit87e965902edfa597f6e99aa07eebc49a7e745bc8
treeb7eb014141a2f89dbbee63b3291ba422130bc067
parent6810afe6a4bf53732ef4fae3e9c1031b55425fa7
parentf548461fca3bba7329777be4f89870c6f1cdccc1
Merge ... '09c9ae46a929db4ad083caeb38025cd7068a7668'
     and 'b5af291fa9dc074af84727684ddae1efa9c1be0d'