Merge branch 'master' of github.com:otcshare/GhostCluster
authorKevron Rees <kevron_m_rees@linux.intel.com>
Thu, 23 Aug 2012 20:05:16 +0000 (13:05 -0700)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Thu, 23 Aug 2012 20:05:16 +0000 (13:05 -0700)

Trivial merge