Merge branch 'master' into ELisp
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Sun, 16 Oct 2011 18:15:01 +0000 (11:15 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Sun, 16 Oct 2011 18:15:01 +0000 (11:15 -0700)

Trivial merge