Merge branch 'refs/heads/relation_proxy' into rails3
Merge branch 'rails3' of github.com:leikind/wice_grid into rails3