Merge remote-tracking branch 'remotes/weil/qemu-2.0' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 26 Mar 2014 14:07:25 +0000 (14:07 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 26 Mar 2014 14:07:25 +0000 (14:07 +0000)
* remotes/weil/qemu-2.0:
  gtk: Support GTK without VTE

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Trivial merge