Merge branch 'master' of github.com:otcshare/GhostCluster into upstream
authorKevron Rees <kevron_m_rees@linux.intel.com>
Mon, 28 Jan 2013 23:32:18 +0000 (15:32 -0800)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Mon, 28 Jan 2013 23:32:18 +0000 (15:32 -0800)

Trivial merge