Merge centos-hacks,.
authorCarl Hetherington <cth@carlh.net>
Tue, 15 Jul 2014 16:52:05 +0000 (17:52 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 15 Jul 2014 16:52:05 +0000 (17:52 +0100)

Trivial merge