Merge branch 'master' into terencehill/screenshot_viewer
authorterencehill <piuntn@gmail.com>
Sun, 3 Jul 2011 17:33:29 +0000 (19:33 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 3 Jul 2011 17:33:29 +0000 (19:33 +0200)

Trivial merge