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

Trivial merge