Commiting to fix merge, and because my 'if' is better than Eric's
And resolving conflict
Merge branch 'master' of github.com:ehainer/ulall

Conflicts:
	app/code/local/Unleaded/All/Model/Observer.php