Merge branch 'pr6'
authorBrian Warner <warner@lothar.com>
Wed, 2 Jul 2014 20:11:28 +0000 (13:11 -0700)
committerBrian Warner <warner@lothar.com>
Wed, 2 Jul 2014 20:11:28 +0000 (13:11 -0700)

Trivial merge