Merge branch 'simple-optimizations' into gh-pages
authorDavid Vazquez <davazp@gmail.com>
Sun, 27 Jan 2013 22:45:40 +0000 (22:45 +0000)
committerDavid Vazquez <davazp@gmail.com>
Sun, 27 Jan 2013 22:45:40 +0000 (22:45 +0000)

Trivial merge