Merge branch 'uri_for_action'
Hans Dieter Pearcey [Fri, 3 Apr 2009 02:53:45 +0000 (02:53 +0000)]

Trivial merge