Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Tue, 25 Jun 2013 12:21:31 +0000 (12:21 +0000)
committerMike Taylor <mike@indexdata.com>
Tue, 25 Jun 2013 12:21:31 +0000 (12:21 +0000)

Trivial merge