[docker-io/el6: 3/4] Merge branch 'el6', remote branch 'origin' into el6

[Vincent Batts]

commit c0c662ced53dcaa1775483b58d21c9acc04c15fa
Author: Vincent Batts <vbatts(a)redhat.com&gt;
Date:   Fri Dec 6 11:51:05 2013 -0500

    Merge branch 'el6', remote branch 'origin' into el6