commit 6cb8160a4717d51fd3cc0baf721946daa60cf921
Merge: 5c19b43... 13a2c0d...
Author: Shawn O. Pearce <sop@google.com>
Date:   Fri Dec 12 13:26:52 2008 -0800

    Merge branch 'b' into d

diff --cc d
index 0000000,0000000..4bcfe98
new file mode 100644
--- /dev/null
+++ b/d
@@@ -1,0 -1,0 +1,1 @@@
++d
