Merge branch 'master' into ELisp
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Tue, 3 Sep 2013 17:13:13 +0000 (10:13 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Tue, 3 Sep 2013 17:13:13 +0000 (10:13 -0700)

Trivial merge