merge of '34c552438e2e3487f826b3198c4bdf7e1445e77e'
authorKoen Kooi <koen@openembedded.org>
Wed, 29 Nov 2006 17:32:55 +0000 (17:32 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 29 Nov 2006 17:32:55 +0000 (17:32 +0000)
commitfd43ce1199d5038e03040878c919498e7f05cfdf
treeb7d3229eb6a474dd27efa999b01a39e1c1e64f13
parentee38ed000e7730986329388a9ea9df259f252a19
parent26cf4b83d4743ff9211033d85f0310cafceeb516
Merge ... '34c552438e2e3487f826b3198c4bdf7e1445e77e'
     and '50cf42d4e0e7f04c4f5e02dbeeaac10fd228c58d'