server-1.2-branch accidentally merged with master

[Alan Coopersmith]

In attempting to checkin a simple configure.ac script fix to the
server-1.2-branch today, I appear to have accidentally merged
master into the server-1.2-branch.   Is there any way to undo this?

(Alternatively, what in master do we not want in the 1.2 branch?
  The wfb merge?   Anything else?)

Sorry about this - I will learn to double check which branch is checked
out before pulling updates next time.

-- 
	-Alan Coopersmith-           alan.coopersmith at sun.com
	 Sun Microsystems, Inc. - X Window System Engineering