Merge branch 'planetlab' of github.com:cdwertmann/rvm-rpm into planetlab