# HG changeset patch
# User b.taylor@willowglen.ca
# Date 1251901834 21600
# Node ID 8d9e7edc01952947e5e6ded2b97e536bdd6f8796
# Parent  127d524a5f1df36b3b9278f3cac85bcb1a7e764f# Parent  d5a5eaea78443c4a74bf01ea3dbf355f1e30417c
merged with lolitech