tree 058b6f58b5ab756f9fe798983e7c7bbf75450509
parent 781ba9d2ed9df07dbb413fb5ee80ef7d353841c9
parent a4a03fc7ef89020baca4f19174e6a43767c6d78a
author Arnaldo Carvalho de Melo <acme@redhat.com> 1328562652 -0200
committer Arnaldo Carvalho de Melo <acme@redhat.com> 1328562662 -0200

Merge branch 'perf/urgent' into perf/core

So that we can get the perf bench exec stack fixes and then apply the
remaining fix for the files added after what is in perf/urgent.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>