Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Wed, 13 Jun 2012 21:34:53 +0000 (14:34 -0700)
committerIvan Kohler <ivan@freeside.biz>
Wed, 13 Jun 2012 21:34:53 +0000 (14:34 -0700)

Trivial merge