Merge from mdeters/miplib branch (commit 'ce7c485182902ae43871057185095f71f74a8a58')
authorMorgan Deters <mdeters@cs.nyu.edu>
Sun, 3 Feb 2013 20:57:01 +0000 (15:57 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Sun, 3 Feb 2013 20:57:01 +0000 (15:57 -0500)

Trivial merge