merge of 0.9.6.8
authorStefan Behnel <scoder@users.berlios.de>
Fri, 9 Nov 2007 06:53:09 +0000 (07:53 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Fri, 9 Nov 2007 06:53:09 +0000 (07:53 +0100)
commit837aa28c812e6c9ef455dfc65d168f106c51d0fb
treed0fc8d8dbae69444219cd0597f67d2f688b158c1
parent7acd5674eaec676b887ffd73fcb53a45df4fd92f
parent483a99c381920a068248d7b5d0efe067e7bffd01
merge of 0.9.6.8