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

[Vincent Batts]

commit 8197a39098b9c5f15fb486b1360dbe2fc7a0c559
Merge: 64f997f 25b1d04
Author: Vincent Batts <vbatts at redhat.com>
Date:   Fri Jan 24 14:03:48 2014 -0500

    Merge branch 'master' into el6

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