Guys,
Here it is in context patch format, to forstall confusion. Please apply, thanks.
-- Josh BerkusPostgreSQL @ SunSan Francisco