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

Trivial merge