merge local with pull-request #7 merge
authorEli Bendersky <eliben@gmail.com>
Sat, 23 Mar 2013 13:14:21 +0000 (06:14 -0700)
committerEli Bendersky <eliben@gmail.com>
Sat, 23 Mar 2013 13:14:21 +0000 (06:14 -0700)

Trivial merge