merge of 'ae600945a62c9f75e22c98c2d956b2d6f1d241e2'
authorKoen Kooi <koen@openembedded.org>
Sun, 9 Dec 2007 09:58:33 +0000 (09:58 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 9 Dec 2007 09:58:33 +0000 (09:58 +0000)
commitf64f1ff17065fd681ef5f7b7f3c991a8107ab40b
treed7d7de0515a9c4d327c652ce228ea4ea2e6eff25
parent1eb88ce51cb7e0db7085cb8b4437050638ec32cf
parent1e927c44a128c74e5a10cff4b5abf7d3dc61da5b
Merge ... 'ae600945a62c9f75e22c98c2d956b2d6f1d241e2'
     and 'b1d80102a53f74c55cb0792f31a406f8c6fda540'