merge sven-ola's tree
authorHannes Gredler <hannes@gredler.at>
Fri, 4 Jan 2008 12:52:57 +0000 (13:52 +0100)
committerHannes Gredler <hannes@gredler.at>
Fri, 4 Jan 2008 12:52:57 +0000 (13:52 +0100)
commit467cd2ab6ec88b01a49f9b3a70a6825908de938e
treefa9256ded0555514564160277f596fdb3e046faf
parent49424a9902eb89516165a3b79082a5f83cfa3412
parentddb240b96be4b3ff2ea370fe51fb7f2b8910b818
merge sven-ola's tree