tree dc7f090fe72b645a5b489ade9088d2125eb8a934
parent 2c097f6003f2a11416706ae3252c2860ed2257a9
parent 53fbf7b5391c76cc474d469bfed6a69a1243f4de
author Anthony Liguori <aliguori@us.ibm.com> 1334063441 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1334063441 -0500

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

* stefanha/trivial-patches:
  make: fix clean rule by removing build file in qom/
  configure: Link qga against UST tracing related libraries
  configure: Link QEMU against 'liburcu-bp'
  main-loop: make qemu_event_handle static
  block/curl: Replace usleep by g_usleep
  qtest: Add missing GCC_FMT_ATTR
  w32: Undefine error constants before their redefinition
  configure: fix mingw32 libs_qga typo