Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Thu, 10 Jan 2013 00:22:41 +0000 (16:22 -0800)
committerIvan Kohler <ivan@freeside.biz>
Thu, 10 Jan 2013 00:22:41 +0000 (16:22 -0800)

Trivial merge