From: Chris Ball <cjb@laptop.org>
Date: Sun, 20 Jun 2010 23:19:06 +0000 (-0400)
Subject: Merge with Trevor.
X-Git-Tag: 1.0.0~59
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0df4bd7ae194bb07f36a2a69a0549037de01cb52;p=be.git

Merge with Trevor.
---

0df4bd7ae194bb07f36a2a69a0549037de01cb52
diff --cc .be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/1f25cba2-03ee-43e1-a042-ef6724938ad8/body
index d2ef28c,0000000..d2ef28c
mode 100644,000000..100644
--- a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/1f25cba2-03ee-43e1-a042-ef6724938ad8/body
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/1f25cba2-03ee-43e1-a042-ef6724938ad8/body
diff --cc .be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/1f25cba2-03ee-43e1-a042-ef6724938ad8/values
index ca3efd0,0000000..ca3efd0
mode 100644,000000..100644
--- a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/1f25cba2-03ee-43e1-a042-ef6724938ad8/values
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/1f25cba2-03ee-43e1-a042-ef6724938ad8/values