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

[Lokesh Mandvekar]

commit 96922ee5b9a6ea49a6b334f704bd979039958e35
Merge: f7bad2f d953d29
Author: Lokesh Mandvekar <lsm5(a)redhat.com&gt;
Date:   Thu Nov 7 23:52:48 2013 -0600

    Merge branch 'master' into f20

 .gitignore     |    2 ++
 docker-io.spec |   38 +++++++++++++++++++++++++++++++-------
 docker.service |    2 ++
 sources        |    2 +-
 4 files changed, 36 insertions(+), 8 deletions(-)
---