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

[Andrey Vagin]

commit 7f0ee49c7d8e20652cd3b2b37c4b920114b9a5b6
Merge: 7af52dd ed5f326
Author: Andrey Vagin <avagin at openvz.org>
Date:   Tue Jul 23 11:59:26 2013 +0400

    Merge branch 'master' into f18

 .gitignore                                         |    1 +
 ...tion-on-architectures-without-support-for.patch |   29 ----
 ...-values-of-LOCAL_-ID-to-zero-until-userns.patch |   15 +-
 sources                                            |    2 +-
 vzctl.spec                                         |  168 ++++++++++----------
 5 files changed, 97 insertions(+), 118 deletions(-)
---