Merge branch 'master' into ELisp.
authorMatt Birkholz <puck@birchwood-abbey.net>
Thu, 8 May 2014 06:42:03 +0000 (23:42 -0700)
committerMatt Birkholz <puck@birchwood-abbey.net>
Thu, 8 May 2014 06:42:03 +0000 (23:42 -0700)

Trivial merge