From 1c8b065261e24b0a64c847d9a828a1a55fa13ba4 Mon Sep 17 00:00:00 2001
From: Pavel Krajcevski <pavel@cs.unc.edu>
Date: Sat, 15 Sep 2012 09:46:18 -0400
Subject: [PATCH] Merge branches 'master' and 'CommandLineTool'