Merge branch 'master' into terencehill/centerprint_stuff
authorterencehill <piuntn@gmail.com>
Fri, 19 Aug 2011 23:11:45 +0000 (01:11 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 19 Aug 2011 23:11:45 +0000 (01:11 +0200)

Trivial merge