Merge branch 'master' of github.com:otcshare/GhostCluster into upstream
authorKevron Rees <kevron_m_rees@linux.intel.com>
Tue, 4 Dec 2012 20:53:12 +0000 (12:53 -0800)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Tue, 4 Dec 2012 20:53:12 +0000 (12:53 -0800)

Trivial merge