Merge remote-tracking branch 'remotes/weil/qemu-2.0' into staging
commit0acf0a50c8ae6a4e146e00df5dba9f763d7b75a6
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 26 Mar 2014 14:07:25 +0000 (26 14:07 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 26 Mar 2014 14:07:25 +0000 (26 14:07 +0000)
treeb52577e132761efb7b4a4eb3343bef396e6d8013
parent7f6613cedc59fa849105668ae971dc31004bca1c
parentbbbf9bfb9c27e389340cf50a11c22fa46c572150
Merge remote-tracking branch 'remotes/weil/qemu-2.0' into staging

* remotes/weil/qemu-2.0:
  gtk: Support GTK without VTE

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