# HG changeset patch
# User Ross Younger <wry@ecoscentric.com>
# Date 1274782267 -3600
# Node ID 7a816fdf8f0f550b4859553131b9db6306720639
# Parent  27f99d87a73d450894ea0325e875025d1f72f2f0# Parent  69decb385a5cb5323eaa6444d4b5266ce226b772
merge upstream