Fix merge of master.
authorCarl Hetherington <cth@carlh.net>
Sun, 23 Sep 2012 13:25:11 +0000 (14:25 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 23 Sep 2012 13:25:11 +0000 (14:25 +0100)
commitce799a03297e4961dc203ceae0dcc41d80a44aa8
tree83504fdfd3761615898390a4a287ba27b136045e
parent93c3365a547fbb7467b6c47571c5a68e17b31e0c
parenta8e064b831718a3b06035c12ae94c3caa7a1b4b3
Fix merge of master.