Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Thu, 22 Aug 2013 11:50:17 +0000 (11:50 +0000)
committerMike Taylor <mike@indexdata.com>
Thu, 22 Aug 2013 11:50:17 +0000 (11:50 +0000)

Trivial merge