Mgerge branch 'master' of github.com:otcshare/GhostCluster into up3 0.2013.7.18
authorKevron Rees <kevron_m_rees@linux.intel.com>
Fri, 19 Jul 2013 23:34:03 +0000 (16:34 -0700)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Fri, 19 Jul 2013 23:34:03 +0000 (16:34 -0700)

Trivial merge