Merge branch 'master' into typesafe
authorDennis Schafroth <dennis@indexdata.com>
Tue, 3 Jan 2012 20:51:45 +0000 (21:51 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Tue, 3 Jan 2012 20:51:45 +0000 (21:51 +0100)

Trivial merge