Merge branch 'master' into speedup
Florian Ragwitz [Mon, 7 Sep 2009 12:46:44 +0000 (14:46 +0200)]
* master:
  Version 0.12_01.


Trivial merge