Sync with 0.9.8 branch.

This commit is contained in:
Bodo Möller 2011-02-08 19:06:57 +00:00
parent c9355e20c3
commit 0bb2154ee9