Merge pull request #325.
authorJoshua Roesslein <jroesslein@gmail.com>
Sat, 17 Aug 2013 07:07:20 +0000 (00:07 -0700)
committerJoshua Roesslein <jroesslein@gmail.com>
Sat, 17 Aug 2013 07:07:20 +0000 (00:07 -0700)

Trivial merge