[ltrace/f16: 2/2] Merge branch 'master' into f16

[Petr Machata]

commit 64948298f77acbb29e94f536adeb7e1dcb094921
Merge: 5b37198 d2c71fc
Author: Petr Machata <pmachata at redhat.com>
Date:   Fri Nov 25 15:22:21 2011 +0100

    Merge branch 'master' into f16
    
    Conflicts:
    	ltrace.spec

 ltrace-0.6.0-clone-test.patch      |   12 +
 ltrace-0.6.0-testsuite-clone.patch |   24 -
 ltrace-0.6.0-thread-races.patch    |  406 +++++++++++++
 ltrace-0.6.0-vfork.patch           | 1130 ++++++++++++++++++++++++++++++++++++
 ltrace.spec                        |   11 +-
 5 files changed, 1557 insertions(+), 26 deletions(-)
---
diff --cc ltrace.spec
index f2c3128,bf21297..5ebc014
--- a/ltrace.spec
+++ b/ltrace.spec
@@@ -80,13 -84,17 +84,16 @@@ rm -rf $RPM_BUILD_ROO
  %config(noreplace) %{_sysconfdir}/ltrace.conf
  
  %changelog
- * Mon Sep 26 2011 Petr Machata <pmachata at redhat.com> - 0.6.0-3
 -* Fri Nov 25 2011 Petr Machata <pmachata at redhat.com> - 0.6.0-4
++* Fri Nov 25 2011 Petr Machata <pmachata at redhat.com> - 0.6.0-3
+ - Add several upstream patches that fix various races in tracing
+   multi-threaded processes
+ - Add upstream patches for support of tracing across vfork
  - Add upstream patches for ppc: excessive shift, and fetching
    function arguments
 -- Bump up revision to preserve upgrade path
  
  * Fri Sep  2 2011 Petr Machata <pmachata at redhat.com> - 0.6.0-2
 -- Add upstream patches for tracing multi-threaded processes, endian
 -  fixes, and a test suite fixlet
 +- Add upstream patches for tracing multi-threaded processes and endian
 +  fixes
  
  * Tue Feb 15 2011 Petr Machata <pmachata at redhat.com> - 0.6.0-1
  - Update to 0.6.0