Merge branch 'refactoring'
authorPete Fotheringham (XP VM on Macbook) <pete.fotheringham@codethink.co.uk>
Wed, 21 Dec 2011 11:20:44 +0000 (11:20 +0000)
committerPete Fotheringham (XP VM on Macbook) <pete.fotheringham@codethink.co.uk>
Wed, 21 Dec 2011 11:20:44 +0000 (11:20 +0000)
Conflicts:
configure.ac


Trivial merge