merge of '0cb2088c75cd013fa4b79bb46028d9d384f0ef81'
authorKoen Kooi <koen@openembedded.org>
Sun, 3 Sep 2006 07:24:56 +0000 (07:24 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 3 Sep 2006 07:24:56 +0000 (07:24 +0000)
commit5dfbd5e4c1f26b0bbf1f5f19e4028e2649ffc391
tree938a08ea02f15b238e030cbcaed29de2f2960139
parentc489f4ed0a4776ecae5f852baf159ca0750d3f3d
parent64610d0e500cafc177e74555ea38ecdc3ede5a17
Merge ... '0cb2088c75cd013fa4b79bb46028d9d384f0ef81'
     and 'ff7b9f5ef2329b56356a8adcbf70e4c4e9a3ecdb'