Merge branch 'for-upstream' of git://github.com/funtoo/vzctl

http://bugzilla.openvz.org/1884