r21160@ares (orig r847): wreis | 2008-08-18 17:37:31 -0300
edenc [Tue, 19 Aug 2008 02:00:16 +0000 (02:00 +0000)]
 removing rss_links layout from site_layout
 r21161@ares (orig r848):  rafl | 2008-08-18 17:43:33 -0300
 Revert "coerce VP::SiteLayouts static_base_uri from URI."

 This reverts commit ffbdd3b7365b23f9498eb0c773a1c4bb8cd1b6a6.


Trivial merge