Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Wed, 26 Dec 2012 18:05:28 +0000 (10:05 -0800)
committerIvan Kohler <ivan@freeside.biz>
Wed, 26 Dec 2012 18:05:28 +0000 (10:05 -0800)

Trivial merge