Merge trunk work that had gotten diverged.

diff --cc NEWS
index a7c1ae83a30ae56ae94892cd3645f0a84d61e0c0,2edf7369d9b7d53d32f1d430c32b80ac04664599..713d272bfaa9186cffc1b8e56096043d2f5adf54
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -5,9 -5,6 +5,26 @@@ subunit release note
  NEXT (In development)
  ---------------------
  
++IMPROVEMENTS
++~~~~~~~~~~~~
++
++* Perl module now correctly outputs "failure" instead of "fail".  (Stewart Smith)
++
++* Shell functions now output timestamps. (Stewart Smith)
++
++BUG FIXES
++~~~~~~~~~
++
++* Add 'subunit --no-xfail', which will omit expected failures from the subunit
++  stream. (John Arbash Meinel, #623642)
++
++* Add 'subunit -F/--only-genuine-failures' which sets all of '--no-skips',
++  '--no-xfail', '--no-passthrough, '--no-success', and gives you just the
++  failure stream. (John Arbash Meinel)
++
 +0.0.7
 +-----
 +
  The Subunit Python test runner ``python -m subunit.run`` can now report the
  test ids and also filter via a test id list file thanks to improvements in
  ``testtools.run``. See the testtools manual, or testrepository - a major
@@@ -67,7 -68,16 +84,6 @@@ IMPROVEMENT
  * The Python2.7 / testtools addUnexpectedSuccess API is now supported. This
    required adding a new status code to the protocol. (Robert Collins, #654474)
  
- =======
 -BUG FIXES
 -~~~~~~~~~
 -
 -* Add 'subunit --no-xfail', which will omit expected failures from the subunit
 -  stream. (John Arbash Meinel, #623642)
 -
 -* Add 'subunit -F/--only-genuine-failures' which sets all of '--no-skips',
 -  '--no-xfail', '--no-passthrough, '--no-success', and gives you just the
 -  failure stream. (John Arbash Meinel)
 -
  CHANGES
  ~~~~~~~