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

[Lokesh Mandvekar]

commit 44d1cd0f6d53d84b9ea9633d3156e2e78e2c6176
Merge: 8f7798e ab27c4d
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date:   Thu Nov 28 12:17:30 2013 -0600

    Merge branch 'master' into f20

 80-docker.rules |    2 ++
 docker-io.spec  |   20 +++++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)
---