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

[Lokesh Mandvekar]

commit 0148e79911be6c4009fb4624a1105f1d1f2e6b92
Merge: 44d1cd0 909a890
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date:   Sun Dec 1 12:08:50 2013 -0600

    Merge branch 'master' into f20

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