Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Fri, 24 Feb 2012 08:12:31 +0000 (00:12 -0800)
committerIvan Kohler <ivan@freeside.biz>
Fri, 24 Feb 2012 08:12:31 +0000 (00:12 -0800)

Trivial merge