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

[Lokesh Mandvekar]

commit d23d04aa2711d0fc5f5289e707ab1f6099248c96
Merge: 50404bb 85e1946
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date:   Mon Dec 2 09:50:12 2013 -0600

    Merge branch 'master' into f20

 80-docker.rules |    4 ++--
 docker-io.spec  |    6 +++++-
 docker.sysvinit |    3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)
---