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

[Lokesh Mandvekar]

commit 40122bf9354f5446768c74b689b224c63f379f28
Merge: c275b77 909a890
Author: Lokesh Mandvekar 
Date:   Sun Dec 1 20:55:30 2013 -0600

Merge branch 'master' into el6

docker-io.spec   |   25 ++++++++++++++++++-------
 docker.service   |    3 ++-
 docker.sysconfig |    2 +-
 docker.sysvinit  |    8 +++++++-
 4 files changed, 28 insertions(+), 10 deletions(-)
---