Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Mon, 2 Apr 2012 17:37:52 +0000 (10:37 -0700)
committerIvan Kohler <ivan@freeside.biz>
Mon, 2 Apr 2012 17:37:52 +0000 (10:37 -0700)

Trivial merge