[vzctl/f18: 5/5] Merge branch 'master' into f18

[Glauber Costa]

commit c6296181fae9af846af2ebb49ed29124bf6664bd
Merge: c9d7338 16d3e9e
Author: Glauber Costa <glommer at gmail.com>
Date:   Wed Apr 24 18:56:21 2013 +0400

    Merge branch 'master' into f18
    
    Conflicts:
    	vzctl.spec

 ...x-pivot_root-failure-with-mount-namespace.patch |   85 ++++++++++++++++++++
 ...-upstream-to-safely-stop-container-when-s.patch |   31 +++++++
 vzctl.spec                                         |   11 +++-
 3 files changed, 126 insertions(+), 1 deletions(-)
---
diff --cc vzctl.spec
index de3ac6c,ce810a0..f3982a9
--- a/vzctl.spec
+++ b/vzctl.spec
@@@ -192,6 -197,13 +197,10 @@@ ls $RPM_BUILD_ROOT/%{_mandir}/man8
  
  
  %changelog
+ * Wed Apr 24 2013 Glauber Costa <glommer at gmail.com> - 4.1.1-4
+ - Include missing dependency for bridge-utils.
+ - Fix problems with user and pid namespaces.
+ 
 -* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.1-3.1
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 -
  * Tue Dec 11 2012 Glauber Costa <glommer at gmail.com> - 4.1.1-3
  - Build on all architectures, fixes #878416. OpenVZ 4.1.1 handles
    that, so we don't need to carry a patch.