Merge branch 'master' of github.com:otcshare/GhostCluster into up3
authorKevron Rees <kevron_m_rees@linux.intel.com>
Thu, 4 Apr 2013 20:33:29 +0000 (13:33 -0700)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Thu, 4 Apr 2013 20:33:29 +0000 (13:33 -0700)

Trivial merge