Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sun, 23 Sep 2012 21:57:08 +0000 (14:57 -0700)
committerIvan Kohler <ivan@freeside.biz>
Sun, 23 Sep 2012 21:57:08 +0000 (14:57 -0700)

Trivial merge