Merge 17067 from trunk.

author Tom Hughes <tom@compton.nu>

Tue, 13 Oct 2009 20:16:03 +0000 (20:16 +0000)

committer Tom Hughes <tom@compton.nu>

Tue, 13 Oct 2009 20:16:03 +0000 (20:16 +0000)
author Tom Hughes <tom@compton.nu>
Tue, 13 Oct 2009 20:16:03 +0000 (20:16 +0000)
committer Tom Hughes <tom@compton.nu>
Tue, 13 Oct 2009 20:16:03 +0000 (20:16 +0000)
diff --cc app/controllers/application_controller.rb
Simple merge
author	Tom Hughes <tom@compton.nu>
	Tue, 13 Oct 2009 20:16:03 +0000 (20:16 +0000)
committer	Tom Hughes <tom@compton.nu>
	Tue, 13 Oct 2009 20:16:03 +0000 (20:16 +0000)