[golang/f19: 3/3] Merge branch 'master' into f19

[Vincent Batts]

commit d4e31c03ca96d4c3c504a71eb900cabea669c8d5
Merge: 80f4cc9 4e1713b
Author: Vincent Batts <vbatts at redhat.com>
Date:   Tue Nov 26 16:06:53 2013 -0500

    Merge branch 'master' into f19

 golang.spec |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)
---