Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Mon, 11 Jun 2012 22:05:30 +0000 (15:05 -0700)
committerIvan Kohler <ivan@freeside.biz>
Mon, 11 Jun 2012 22:05:30 +0000 (15:05 -0700)

Trivial merge