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

Trivial merge