merge of '8c9fa400aa857e0110b0a702db34db034b841697'
authorKoen Kooi <koen@openembedded.org>
Mon, 28 Aug 2006 20:57:49 +0000 (20:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 28 Aug 2006 20:57:49 +0000 (20:57 +0000)
commit8e9d509513711a45f5a6dce57226bf5afaa274c9
tree7efce36ed3702e3d9ea516cb6fd27d79e76bba5f
parent4f3fdadd87d7e5cea2bd97454857fbc4fd4018e0
parentc50a5743b3273d97db8957915d084de01fef7c59
Merge ... '8c9fa400aa857e0110b0a702db34db034b841697'
     and 'bba107bc97a6967bbada8d85602a9bae89002749'