v1.4 by Jensensen » Fri Jan 22, 2010 00:09
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md