Merge branch 'master' into ELisp
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Fri, 10 Jun 2011 22:18:15 +0000 (15:18 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Fri, 10 Jun 2011 22:18:15 +0000 (15:18 -0700)

Trivial merge