Merge branch 'gui_change'sgn-47.0
commitffae6b6dbf1a29e7d24ed8800bd9d02d5789fc72
authorRobert Buels <rmb32@cornell.edu>
Wed, 19 May 2010 16:43:11 +0000 (19 09:43 -0700)
committerRobert Buels <rmb32@cornell.edu>
Wed, 19 May 2010 16:43:11 +0000 (19 09:43 -0700)
tree59ea8318c9bc4e428b8ffc67d585d638c1537900
parentbe09c6ea7550612e0c07d5b460765bf583027a49
parent76c0766cb03ea879bfa732d0540cca311c9813c3
Merge branch 'gui_change'