Vadim Zeitlin - 2009-10-17

Patch against 0.2.5