Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Fri, 22 Mar 2013 17:15:05 +0000 (10:15 -0700)
committerIvan Kohler <ivan@freeside.biz>
Fri, 22 Mar 2013 17:15:05 +0000 (10:15 -0700)

Trivial merge