Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Wed, 29 Aug 2012 22:19:17 +0000 (15:19 -0700)
committerIvan Kohler <ivan@freeside.biz>
Wed, 29 Aug 2012 22:19:17 +0000 (15:19 -0700)

Trivial merge