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

[Lokesh Mandvekar]

commit 5299cc4bc4af89e771f45f2ea27a5f49bfd11a85
Merge: 96922ee ef21741
Author: Lokesh Mandvekar <lsm5(a)redhat.com&gt;
Date:   Thu Nov 21 17:29:39 2013 -0600

    Merge branch 'master' into f20

 .gitignore               |    2 ++
 docker-bridge_flag.patch |   16 ++++++++++++++++
 docker-io.spec           |   46 ++++++++++++++++++++++++++++++++++++++--------
 docker.service           |    2 --
 sources                  |    2 +-
 5 files changed, 57 insertions(+), 11 deletions(-)
---