r23072@martha (orig r912): groditi | 2008-10-11 16:35:20 -0400
groditi [Sat, 11 Oct 2008 20:36:22 +0000 (20:36 +0000)]
 uri vp, widget, template


Trivial merge