Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/git-tools
authorHeikki Levanto <heikki@indexdata.dk>
Mon, 15 Aug 2011 08:58:31 +0000 (10:58 +0200)
committerHeikki Levanto <heikki@indexdata.dk>
Mon, 15 Aug 2011 08:58:31 +0000 (10:58 +0200)

Trivial merge