From: Richard Millet <remillet@berkeley.edu>
Date: Fri, 17 Feb 2012 23:51:17 +0000 (-0800)
Subject: Merge branch 'detached-head'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=587cee86a0f4460239dd4223661317ca44a05179;p=tmp%2Fjakarta-migration.git

Merge branch 'detached-head'

Conflicts:
	README.txt
---

587cee86a0f4460239dd4223661317ca44a05179
diff --cc README.txt
index 14176e9f2,320be9edc..2d7ef5e5e
--- a/README.txt
+++ b/README.txt
@@@ -28,4 -28,5 +28,6 @@@ Make 
  Make 6
  
  Make 7
+ 
 +Make 8
+ Make 9 in detached head again.