debug
goner
Merge branch 'master' into gh-pages

Conflicts:
	x.html
Merge branch 'master' into gh-pages
fix with rename
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
also going to need this in trunk