Trying to resolve a conflict
authorDaniel Röhrig <daniel.roehrig@mailbox.tu-berlin.de>
Thu, 10 Oct 2013 14:04:58 +0000 (16:04 +0200)
committerDaniel Röhrig <daniel.roehrig@mailbox.tu-berlin.de>
Thu, 10 Oct 2013 14:04:58 +0000 (16:04 +0200)
Conflicts:
run_qemu


Trivial merge