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

[Lokesh Mandvekar]

commit 06435b5dd948ca5d4f019931eb7bef40f904e707
Merge: a38ea80 dc9edd7
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date:   Wed Nov 27 08:38:48 2013 -0600

    Merge branch 'master' into f20

 .gitignore               |   11 ++---------
 docker-bridge_flag.patch |   16 ----------------
 docker-io.spec           |   41 ++++++++++++++++++-----------------------
 sources                  |    2 +-
 4 files changed, 21 insertions(+), 49 deletions(-)
---