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

[Lokesh Mandvekar]

commit c275b773820e73b7517d71eb3dd594718941a994
Merge: 5a35ce7 ab27c4d
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date:   Thu Nov 28 12:37:06 2013 -0600

    Merge branch 'master' into el6

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