Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Wed, 27 Feb 2013 23:44:02 +0000 (15:44 -0800)
committerIvan Kohler <ivan@freeside.biz>
Wed, 27 Feb 2013 23:44:02 +0000 (15:44 -0800)

Trivial merge