[docker-io/el6: 4/4] Merge branch 'master' into el6

[Lokesh Mandvekar]

commit 5a35ce777f7707b4e3a6235509047dcefab17169
Merge: a815094 c03fcad
Author: Lokesh Mandvekar 
Date:   Thu Nov 28 03:32:15 2013 -0600

Merge branch 'master' into el6

Signed-off-by: Lokesh Mandvekar

Conflicts:
    	docker-io.spec

docker-0.7.0-iptables-fix.patch |   89 +++++++++++++++++++++++++++++++++++++++
 docker-io.spec                  |    8 +++-
 docker.service                  |    2 +
 sources                         |    2 +-
 4 files changed, 99 insertions(+), 2 deletions(-)
---