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

[Lokesh Mandvekar]

commit d2b4ea650a55e27f5b6bc503db3b1da28a5818d3
Merge: 40122bf 85e1946
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date:   Mon Dec 2 10:20:03 2013 -0600

    Merge branch 'master' into el6

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