Please remember that the 3.0.x branch is where we are doing GA work now
and it is also in this branch 3.0.1 work will be done *after* GA have
That means 3.0.1 work should still wait.
trunk is for 3.1.0 work and of course any thing you do in 3.0.x should
go to trunk - but not the other way around.
3.0.1 is for bugfixes *only*, no change in behavior unless discussed
3.1 is for new features/major but limited changes
...and don't forget to set the proper fix version(s) when