merge of '0573649abd1cf5b9f42a282ceefd2a99912dae21'
authorKoen Kooi <koen@openembedded.org>
Mon, 3 Dec 2007 15:49:58 +0000 (15:49 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 3 Dec 2007 15:49:58 +0000 (15:49 +0000)
commited26aba10100117676b1c2beff72c3e07ea7c2ed
tree87dc841f05b67196914dd0b4f24ce6799354d348
parent065116d010db4398f62a95fd9944704d12399856
parent3403c1c9030f97246acbb16d4214a47ed970fd41
Merge ... '0573649abd1cf5b9f42a282ceefd2a99912dae21'
     and 'a5835e350969f436aec7b4c92890a1e73dcd6c3e'