# HG changeset patch
# User Matthew Turk <matthewturk@gmail.com>
# Date 1247597510 14400
# Branch raytrace
# Node ID bcb28afc0b60aa60f65f72d28ca9be985eaa0601
# Parent  547d886e82642901ebf83274f14bb69c06184fc6
# Parent  8d36a87a55153e4f449c50c3800d4058f5973965
Merging, but mostly using my changes, will sync with Britton in a bit