Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Tue, 9 Oct 2012 19:32:39 +0000 (12:32 -0700)
committerIvan Kohler <ivan@freeside.biz>
Tue, 9 Oct 2012 19:32:39 +0000 (12:32 -0700)

Trivial merge