Merge in build system changes.
authorDavid Given <dg@cowlark.com>
Thu, 16 May 2013 13:33:19 +0000 (14:33 +0100)
committerDavid Given <dg@cowlark.com>
Thu, 16 May 2013 13:33:19 +0000 (14:33 +0100)

Trivial merge