Merge 16891:17044 from trunk.

diff --cc app/controllers/trace_controller.rb
index 17b66796923f9e4021bb29a93733913e99f95fdc,b8d189316d0d70f1c926b3198f4197229c95460d..f06a162fbc00b850d03b971cc7a59ae9ad60ec62
--- 1/app/controllers/trace_controller.rb
--- 2/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@@ -3,14 -3,12 +3,14 @@@ class TraceController < ApplicationCont
  
    before_filter :authorize_web
    before_filter :set_locale
-   before_filter :require_user, :only => [:mine, :create, :edit, :delete, :make_public]
+   before_filter :require_user, :only => [:mine, :create, :edit, :delete]
    before_filter :authorize, :only => [:api_details, :api_data, :api_create]
    before_filter :check_database_readable, :except => [:api_details, :api_data, :api_create]
-   before_filter :check_database_writable, :only => [:create, :edit, :delete, :make_public]
+   before_filter :check_database_writable, :only => [:create, :edit, :delete]
    before_filter :check_api_readable, :only => [:api_details, :api_data]
    before_filter :check_api_writable, :only => [:api_create]
 +  before_filter :require_allow_read_gpx, :only => [:api_details, :api_data]
 +  before_filter :require_allow_write_gpx, :only => [:api_create]
   
    # Counts and selects pages of GPX traces for various criteria (by user, tags, public etc.).
    #  target_user - if set, specifies the user to fetch traces for.  if not set will fetch all traces

diff --cc app/models/user.rb
Simple merge

diff --cc config/locales/en.yml
Simple merge

diff --cc config/routes.rb
Simple merge

diff --cc db/migrate/040_create_oauth_tables.rb
index 95d690512300fbcbeaaf9c86509ff74d258cfd8b,0000000000000000000000000000000000000000..95d690512300fbcbeaaf9c86509ff74d258cfd8b
mode 100644,000000..100644
--- 1/db/migrate/039_create_oauth_tables.rb
--- /dev/null
+++ b/db/migrate/040_create_oauth_tables.rb

diff --cc db/migrate/041_add_fine_o_auth_permissions.rb
index ad4c7a8a4f7bc37580de3ef20b34715825004e13,0000000000000000000000000000000000000000..ad4c7a8a4f7bc37580de3ef20b34715825004e13
mode 100644,000000..100644
--- 1/db/migrate/040_add_fine_o_auth_permissions.rb
--- /dev/null
+++ b/db/migrate/041_add_fine_o_auth_permissions.rb

diff --cc db/migrate/042_add_foreign_keys_to_oauth_tables.rb
index 09de54349c26bd477acc187275d56c2e902a2f4c,0000000000000000000000000000000000000000..09de54349c26bd477acc187275d56c2e902a2f4c
mode 100644,000000..100644
--- 1/db/migrate/041_add_foreign_keys_to_oauth_tables.rb
--- /dev/null
+++ b/db/migrate/042_add_foreign_keys_to_oauth_tables.rb