Merge branch 'wimboot_fast'
authorEric Biggers <ebiggers3@gmail.com>
Fri, 29 Aug 2014 00:45:34 +0000 (19:45 -0500)
committerEric Biggers <ebiggers3@gmail.com>
Fri, 29 Aug 2014 00:45:34 +0000 (19:45 -0500)

Trivial merge