Merge branch 'master' into terencehill/incompatible_mutators
authorterencehill <piuntn@gmail.com>
Tue, 7 Feb 2012 19:46:47 +0000 (20:46 +0100)
committerterencehill <piuntn@gmail.com>
Tue, 7 Feb 2012 19:46:47 +0000 (20:46 +0100)

Trivial merge