Merge remote-tracking branch 'origin/master'
authorKeith Packard <keithp@keithp.com>
Sat, 17 Aug 2013 14:03:26 +0000 (16:03 +0200)
committerKeith Packard <keithp@keithp.com>
Sat, 17 Aug 2013 14:03:26 +0000 (16:03 +0200)

Trivial merge