# HG changeset patch
# User Chris Ridgway <ckridgway@gmail.com>
# Date 1321505878 21600
# Node ID 4e6a30e353346df1234db7de525df719c6076bff
# Parent  c3b4884fe4ea9e005eda745a88c3260c6e15b1c5# Parent  057b0a016b7adfdd058aa1c9e7c19bfaefbd486a
Merging default back into my experimental UI branch for more experimenting.