[docker-io/f20: 3/3] Merge branch 'f20' of ssh://pkgs.fedoraproject.org/docker-io into f20

[Lokesh Mandvekar]

commit bf0e23cd02178827184ff8947177b1edf28964d5
Merge: 5299cc4 d2b2f63
Author: Lokesh Mandvekar <lsm5(a)redhat.com&gt;
Date:   Thu Nov 21 17:30:48 2013 -0600

    Merge branch 'f20' of ssh://pkgs.fedoraproject.org/docker-io into f20

---