Merge branch 'master' of git.freeside.biz:/home/git/freeside

diff --combined FS/FS/AccessRight.pm
index bd8a889,3d58d20..50fb0e3
--- 1/FS/FS/AccessRight.pm
--- 2/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@@ -182,7 -182,6 +182,7 @@@ tie my %rights, 'Tie::IxHash'
      'Unvoid invoices',
      'Delete invoices',
      'View customer tax exemptions', #yow
 +    'Edit customer tax exemptions', #NEWNEW
      'Add customer tax adjustment', #new, but no need to phase in
      'View customer batched payments', #NEW
      'View customer pending payments', #NEW
@@@ -342,6 -341,8 +342,8 @@@
      'Edit package definitions',
      { rightname=>'Edit global package definitions', global=>1 },
    
+     'Bulk edit package definitions',
+ 
      'Edit billing events',
      { rightname=>'Edit global billing events', global=>1 },