Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Fri, 23 Mar 2012 18:21:19 +0000 (11:21 -0700)
committerIvan Kohler <ivan@freeside.biz>
Fri, 23 Mar 2012 18:21:19 +0000 (11:21 -0700)

Trivial merge