smerged changes from with_proxy_subs branch
John Napiorkowski [Thu, 23 Oct 2008 20:56:15 +0000 (20:56 +0000)]

Trivial merge