test 21/05/2012
Merge remote-tracking branch 'origin/master'

Conflicts:
	parser.rb