Merge branch 'kberg-work'
authorRobert Konigsberg <konigsberg@gmail.com>
Sat, 6 Dec 2014 16:23:08 +0000 (11:23 -0500)
committerRobert Konigsberg <konigsberg@gmail.com>
Sat, 6 Dec 2014 16:23:08 +0000 (11:23 -0500)

Trivial merge