Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sat, 19 Jan 2013 19:31:40 +0000 (11:31 -0800)
committerIvan Kohler <ivan@freeside.biz>
Sat, 19 Jan 2013 19:31:40 +0000 (11:31 -0800)

Trivial merge