Merge branch 'master' into tj-worg
authortj <tj@data-driven.de>
Fri, 5 Apr 2013 23:49:37 +0000 (01:49 +0200)
committertj <tj@data-driven.de>
Fri, 5 Apr 2013 23:49:37 +0000 (01:49 +0200)

Trivial merge