merged?
Merge branch 'rails3' of github.com:virtualop/virtualop_webapp into rails3