commit 9f190d234c40f16c63c3cf4063f18d82af75c9b4 Merge: 4475e3e 6aa3636 Author: Joe Orton <jorton at redhat.com> Date: Thu Aug 21 17:14:26 2014 +0100 Merge. ---