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

[Lokesh Mandvekar]

commit b1a032805ac7744bfc7645935f5defb2ce40bbc9
Merge: ef0458a 0004f69
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date:   Thu Nov 28 00:52:36 2013 -0600

    Merge branch 'master' into f20

 sources |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---