Merge #9696

author Mark Dickinson <mdickinson@enthought.com>

Sun, 27 Mar 2011 15:30:07 +0000 (16:30 +0100)

committer Mark Dickinson <mdickinson@enthought.com>

Sun, 27 Mar 2011 15:30:07 +0000 (16:30 +0100)
author Mark Dickinson <mdickinson@enthought.com>
Sun, 27 Mar 2011 15:30:07 +0000 (16:30 +0100)
committer Mark Dickinson <mdickinson@enthought.com>
Sun, 27 Mar 2011 15:30:07 +0000 (16:30 +0100)
diff --cc Misc/ACKS

index 9747ae7ef508fb698572b1394294018f8b430a01,7a0982b78bb3a8582888479bc10c1b17c3b9c654..c05da80645f242087209864dd5531c96f8d8e58f
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -329,8 -302,8 +329,9 @@@ Hans de Graaf
   Eddy De Greef
   Duncan Grisby
   Fabian Groffen
+ +Eric Groo
   Dag Gruneau
+ Filip Gruszczyński
   Michael Guravage
   Lars Gustäbel
   Thomas Güttler
diff --cc Misc/NEWS
Simple merge
author	Mark Dickinson <mdickinson@enthought.com>
	Sun, 27 Mar 2011 15:30:07 +0000 (16:30 +0100)
committer	Mark Dickinson <mdickinson@enthought.com>
	Sun, 27 Mar 2011 15:30:07 +0000 (16:30 +0100)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history