patch should apply to all branches and includes a minor cleanup
+1 but your patch won't apply
Sorry about that. New patch attached. We will need the same fix in different branches I imagine.
You have already gotten +1
You can commit this any time.
Also committed to 0.3 branch and trunk.