Merge branch 'master' into multi-monitor
authorJon Trulson <jon@radscan.com>
Sun, 26 May 2013 23:50:12 +0000 (17:50 -0600)
committerJon Trulson <jon@radscan.com>
Sun, 26 May 2013 23:50:12 +0000 (17:50 -0600)

Trivial merge