[docker-io/f20: 2/2] Merge branch 'master' into f20

[Lokesh Mandvekar]

commit a5b1820a9e7304e55e690e81031aa7ca049de608
Merge: b1a0328 0a007fd
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date:   Thu Nov 28 01:53:13 2013 -0600

    Merge branch 'master' into f20

 docker-0.7.0-iptables-fix.patch |  646 +++++++++++++++++++++++++++++++++++++++
 docker-io.spec                  |   15 +-
 sources                         |    2 +-
 3 files changed, 657 insertions(+), 6 deletions(-)
---