From fd2ba216a3f8e1c24dc4d3e0449856ae60263583 Mon Sep 17 00:00:00 2001
From: Pavel Krajcevski <pavel@cs.unc.edu>
Date: Sun, 26 Aug 2012 14:43:09 -0400
Subject: [PATCH] Merge branches 'FixSSEDetection' and 'master'