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

[Lokesh Mandvekar]

commit 0695de1b2139321a32f6bd2e7b20f2facbe32b2d
Merge: a5b1820 0832c9e
Author: Lokesh Mandvekar 
Date:   Thu Nov 28 02:23:53 2013 -0600

Merge branch 'master' into f20

docker-0.7.0-iptables-fix.patch |  595 ++-------------------------------------
 docker-io.spec                  |    5 +-
 2 files changed, 23 insertions(+), 577 deletions(-)
---