# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1334265603 14400
# Node ID 8ecbfc2693e4aeccd696c2670f7325b66f911230
# Parent  5bf26d7a0c8a6c06bcdcb2898d0e5e877c0408f1# Parent  e23d3b14230bb2a0ca6918f09e8ebebaff44e66f
Merge.

diff -r 5bf26d7a0c8a -r 8ecbfc2693e4 .hgtags