Merge branch 'ecraven-swank'
authorTaylor R Campbell <campbell@mumble.net>
Wed, 11 Jul 2012 03:46:20 +0000 (03:46 +0000)
committerTaylor R Campbell <campbell@mumble.net>
Wed, 11 Jul 2012 03:46:20 +0000 (03:46 +0000)

Trivial merge