Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Fri, 20 Apr 2012 21:25:30 +0000 (14:25 -0700)
committerIvan Kohler <ivan@freeside.biz>
Fri, 20 Apr 2012 21:25:30 +0000 (14:25 -0700)

Trivial merge