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

[Vincent Batts]

commit 583f94dcc1bed1619afb2c2b7c52fa7b4adba1c9
Merge: a70daa8 25b1d04
Author: Vincent Batts <vbatts at redhat.com>
Date:   Fri Jan 24 14:04:24 2014 -0500

    Merge branch 'master' into f19

 golang-1.2-skipCpuProfileTest.patch |   12 ++++++++++++
 golang.spec                         |   12 +++++++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---