Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Thu, 30 Aug 2012 07:48:19 +0000 (00:48 -0700)
committerIvan Kohler <ivan@freeside.biz>
Thu, 30 Aug 2012 07:48:19 +0000 (00:48 -0700)

Trivial merge