merge of 'd70f986456dbed534668139d7aff0d7ddbd4d10e'
authorKoen Kooi <koen@openembedded.org>
Wed, 4 Oct 2006 13:26:53 +0000 (13:26 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 4 Oct 2006 13:26:53 +0000 (13:26 +0000)
commit40efe2bbed3940f1a6acdf11d70ffb9c097782a1
tree6bd22321bb7b496c831cd93e0d5f655f531b3c4c
parent4756d0a3c28e6dbf3374ff0435f6b5e8a8cf9f20
parent844f7ef25e0634ed47e6e0a5f28ff9813a0518d8
Merge ... 'd70f986456dbed534668139d7aff0d7ddbd4d10e'
     and 'e0c1d149111b1270a0ae00ae100635a5a0be3051'