Merge branch 'FREESIDE_2_3_BRANCH' of git.freeside.biz:/home/git/freeside into 2.3
authorMark Wells <mark@freeside.biz>
Tue, 21 Feb 2012 07:58:23 +0000 (23:58 -0800)
committerMark Wells <mark@freeside.biz>
Tue, 21 Feb 2012 07:58:23 +0000 (23:58 -0800)

Trivial merge