Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sun, 15 Apr 2012 22:38:47 +0000 (15:38 -0700)
committerIvan Kohler <ivan@freeside.biz>
Sun, 15 Apr 2012 22:38:47 +0000 (15:38 -0700)

Trivial merge