Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sat, 24 Mar 2012 23:53:33 +0000 (16:53 -0700)
committerIvan Kohler <ivan@freeside.biz>
Sat, 24 Mar 2012 23:53:33 +0000 (16:53 -0700)

Trivial merge