Merge branch 'master' into terencehill/screenshot_viewer
authorterencehill <piuntn@gmail.com>
Sun, 5 Jun 2011 22:40:03 +0000 (00:40 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 5 Jun 2011 22:40:03 +0000 (00:40 +0200)

Trivial merge