Merge branch 'pure-ops' into full-nelson-ops
Lukas Mai [Sun, 24 Jun 2012 11:06:15 +0000 (13:06 +0200)]

Trivial merge