merge of '73a0fd7a86c83ccf1f4ef3268b3d5af71f74a60a'
authorKoen Kooi <koen@openembedded.org>
Sun, 13 Aug 2006 10:38:21 +0000 (10:38 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 13 Aug 2006 10:38:21 +0000 (10:38 +0000)
commit5240bd311339bb7ebfe9ef7e30f17475e9e2be8c
treebe16db9a40d121f503ad5aa09bcd1af88c9de8e4
parent49b9fe3822a50c63c908081249a620a6ae061c78
parentdf819c5d381a62623a6d5fa1c1ef723fd0da0537
Merge ... '73a0fd7a86c83ccf1f4ef3268b3d5af71f74a60a'
     and 'cca0d62f63238636b31f2f73cf7d30fce2b62e84'