r23071@martha (orig r911): groditi | 2008-10-11 16:34:25 -0400
groditi [Sat, 11 Oct 2008 20:36:14 +0000 (20:36 +0000)]
 image vp, widget, template


Trivial merge