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

[Lokesh Mandvekar]

commit ece2f5f4d54ad98962ed352052d66a47524b1c5c
Merge: 06435b5 38aab8d
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date:   Wed Nov 27 16:04:42 2013 -0600

    Merge branch 'master' into f20

 docker-io.spec          |   39 ++++++++++++++++++++++++++++++++++-----
 docker-rhel-brctl.patch |   21 +++++++++++++++++++++
 2 files changed, 55 insertions(+), 5 deletions(-)
---