Merge branch 'master' into local-svn

Files:
copied: from /trunk/generators/role_model/USAGE (r22) to /trunk/authorization/generators/role_model/USAGE (try)
deleted: /trunk/lib/publishare/identity.rb
deleted: /trunk/generators/role_model/templates/fixtures.yml
copied: from /trunk/lib/publishare/parser.rb (r22) to /trunk/authorization/lib/publishare/parser.rb (try)
copied: from /trunk/README_developers.txt (r22) to /trunk/authorization/README_developers.txt (try)
copied: from /trunk/CHANGELOG.txt (r22) to /trunk/authorization/CHANGELOG.txt (try)
added: /trunk/authorization/doc (try)
deleted: /trunk/init.rb
added: /trunk/authorization/lib (try)
deleted: /trunk/generators/role_model/templates/unit_test.rb
copied: from /trunk/install.rb (r22) to /trunk/authorization/install.rb (try)
copied: from /trunk/lib/authorization.rb (r22) to /trunk/authorization/lib/authorization.rb (try)
added: /trunk/authorization/generators (try)
deleted: /trunk/MIT-LICENSE
copied: from /trunk/about.yml (r22) to /trunk/authorization/about.yml (try)
deleted: /trunk/README.txt
deleted: /trunk/tasks/authorization_tasks.rake
added: /trunk/authorization/test (try)
copied: from /trunk/doc/authorization_example.rb (r22) to /trunk/authorization/doc/authorization_example.rb (try)
deleted: /trunk/Rakefile
copied: from /trunk/generators/role_model/templates/migration.rb (r22) to /trunk/authorization/generators/role_model/templates/migration.rb (try)
copied: from /trunk/generators/role_model/role_model_generator.rb (r22) to /trunk/authorization/generators/role_model/role_model_generator.rb (try)
deleted: /trunk/lib/publishare/hardwired_roles.rb
deleted: /trunk/doc/authorization_example.gif
added: /trunk/authorization/tasks (try)
copied: from /trunk/lib/publishare/exceptions.rb (r22) to /trunk/authorization/lib/publishare/exceptions.rb (try)
deleted: /trunk/lib/publishare/object_roles_table.rb
deleted: /trunk/generators/role_model/templates/model.rb
deleted: /trunk/test/README.txt
deleted: /trunk/generators/role_model/USAGE
copied: from /trunk/lib/publishare/identity.rb (r22) to /trunk/authorization/lib/publishare/identity.rb (try)
added: /trunk/authorization (try)
copied: from /trunk/generators/role_model/templates/fixtures.yml (r22) to /trunk/authorization/generators/role_model/templates/fixtures.yml (try)
deleted: /trunk/lib/publishare/parser.rb
deleted: /trunk/README_developers.txt
added: /trunk/authorization/lib/publishare (try)
deleted: /trunk/CHANGELOG.txt
copied: from /trunk/init.rb (r22) to /trunk/authorization/init.rb (try)
copied: from /trunk/generators/role_model/templates/unit_test.rb (r22) to /trunk/authorization/generators/role_model/templates/unit_test.rb (try)
deleted: /trunk/install.rb
deleted: /trunk/lib/authorization.rb
copied: from /trunk/MIT-LICENSE (r22) to /trunk/authorization/MIT-LICENSE (try)
deleted: /trunk/about.yml
copied: from /trunk/README.txt (r22) to /trunk/authorization/README.txt (try)
copied: from /trunk/tasks/authorization_tasks.rake (r22) to /trunk/authorization/tasks/authorization_tasks.rake (try)
deleted: /trunk/doc/authorization_example.rb
copied: from /trunk/Rakefile (r22) to /trunk/authorization/Rakefile (try)
deleted: /trunk/generators/role_model/templates/migration.rb
deleted: /trunk/generators/role_model/role_model_generator.rb
copied: from /trunk/lib/publishare/hardwired_roles.rb (r22) to /trunk/authorization/lib/publishare/hardwired_roles.rb (try)
copied: from /trunk/doc/authorization_example.gif (r22) to /trunk/authorization/doc/authorization_example.gif (try)
deleted: /trunk/lib/publishare/exceptions.rb
copied: from /trunk/lib/publishare/object_roles_table.rb (r22) to /trunk/authorization/lib/publishare/object_roles_table.rb (try)
added: /trunk/authorization/generators/role_model/templates (try)
copied: from /trunk/generators/role_model/templates/model.rb (r22) to /trunk/authorization/generators/role_model/templates/model.rb (try)
added: /trunk/authorization/generators/role_model (try)
copied: from /trunk/test/README.txt (r22) to /trunk/authorization/test/README.txt (try)