Rev 4895: Merge bzr.dev 4896, resolve NEWS in http://bazaar.launchpad.net/~jameinel/bzr/2.1-Dhpss-server

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.1-Dhpss-server

------------------------------------------------------------
revno: 4895 [merge]
revision-id: john at arbash-meinel.com-20091214202313-b7wv74di08p29qjq
parent: john at arbash-meinel.com-20091214161605-ifvx2fwd2b7rlvsf
parent: pqm at pqm.ubuntu.com-20091214180342-nk22cwvqcz54e331
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1-Dhpss-server
timestamp: Mon 2009-12-14 14:23:13 -0600
message:
  Merge bzr.dev 4896, resolve NEWS
added:
  doc/developers/principles.txt  principles.txt-20091210051924-glnv9z521rg59deg-1
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/shelf_ui.py             shelver.py-20081005210102-33worgzwrtdw0yrm-1
  bzrlib/tests/blackbox/test_filtered_view_ops.py test_filtered_view_o-20081110012645-5t7ogtola0l33lkg-1
  bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
  bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
  bzrlib/tests/commands/test_update.py test_update.py-20070910091045-8uyp8v73j926l1g2-1
  bzrlib/tests/script.py         script.py-20090901081155-yk3tiy1nunxg16ne-1
  bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
  bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
  doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
  doc/en/admin-guide/code-browsing.txt codebrowsing.txt-20091205144603-lgpl0e0z6lzk2rdw-3
  doc/en/admin-guide/hooks-plugins.txt hooksplugins.txt-20091205144603-lgpl0e0z6lzk2rdw-5
  doc/en/admin-guide/migration.txt migration.txt-20091205144603-lgpl0e0z6lzk2rdw-8
  doc/en/admin-guide/upgrade.txt upgrade.txt-20091205144603-lgpl0e0z6lzk2rdw-12
-------------- next part --------------

Diff too large for email (1191 lines, the limit is 1000).