Second commit
Merge branch 'master' of ssh://github.com/jjtoth/may09_drupal

Conflicts:
	README