[patch/f13/master: 12/12] Merge branch 'f12' into f13

[Tim Waugh]

commit a1c89f8d7ee895942859dbe43a5f772776bc6c31
Merge: 05e2d2b 35f37f0
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Aug 6 17:27:06 2010 +0100

    Merge branch 'f12' into f13

 patch-get-arg.patch |   12 ++++++++++++
 patch-selinux.patch |    2 +-
 patch.spec          |   16 +++++++++++++++-
 3 files changed, 28 insertions(+), 2 deletions(-)
---
diff --cc patch.spec
index d7a08e7,ed6fb9a..32b7a06
--- a/patch.spec
+++ b/patch.spec
@@@ -54,7 -61,11 +61,14 @@@ rm -rf $RPM_BUILD_ROO
  %{_mandir}/*/*
  
  %changelog
+ * Fri Aug  6 2010 Tim Waugh <twaugh at redhat.com> 2.6.1-3
+ - Fixed interpretation of return value from getfilecon().
+ - Fixed argument type for --get (bug #553624).
+ 
 -* Fri Aug  6 2010 Tim Waugh <twaugh at redhat.com>
++* Wed Mar 10 2010 Dennis Gilmore <dennis at ausil.us>
++- using -fstack-projector causes weirdness on 32 bit sparc so disabling for now
++
 +* Wed Mar  3 2010 Tim Waugh <twaugh at redhat.com> 2.6.1-2
  - Added comments for all patches.
  - Ship COPYING file.
  - Removed sparc ifdefs in spec file.