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

Trivial merge