Merge remote branch 'upstream/master'
authorRafal Krypa <r.krypa@samsung.com>
Wed, 24 Nov 2010 07:22:50 +0000 (16:22 +0900)
committerRafal Krypa <r.krypa@samsung.com>
Wed, 24 Nov 2010 07:22:50 +0000 (16:22 +0900)
1  2 
qemu-char.c

diff --cc qemu-char.c
Simple merge