Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sun, 6 May 2012 08:04:18 +0000 (01:04 -0700)
committerIvan Kohler <ivan@freeside.biz>
Sun, 6 May 2012 08:04:18 +0000 (01:04 -0700)

Trivial merge