Merge branch 'master' of git+ssh://repo.or.cz/srv/git/Worg
authorErik Iverson <erikriverson@gmail.com>
Wed, 19 Jan 2011 00:28:50 +0000 (18:28 -0600)
committerErik Iverson <erikriverson@gmail.com>
Wed, 19 Jan 2011 00:28:50 +0000 (18:28 -0600)

Trivial merge