Merge branch 'master' into terencehill/misc_bugfixes
authorterencehill <piuntn@gmail.com>
Fri, 13 Aug 2010 14:56:49 +0000 (16:56 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 13 Aug 2010 14:56:49 +0000 (16:56 +0200)

Trivial merge