Merge branch 'master' into gh-pages
authorDavid Vazquez <davazp@gmail.com>
Fri, 18 Jan 2013 02:17:51 +0000 (02:17 +0000)
committerDavid Vazquez <davazp@gmail.com>
Fri, 18 Jan 2013 02:17:51 +0000 (02:17 +0000)

Trivial merge