Merge commit 'origin/upstream' into test
authorJuha Riihimäki <juhriihi@esdhcp03986.research.nokia.com>
Tue, 7 Apr 2009 11:39:13 +0000 (14:39 +0300)
committerJuha Riihimäki <juhriihi@esdhcp03986.research.nokia.com>
Tue, 7 Apr 2009 11:39:13 +0000 (14:39 +0300)
commit4dff124254a332d51b8c639de9618b4f5a0e1ff8
tree0857952dc308eae1f2e3bf76c78dffd5f664614d
parent79c52e6656614041db396163955cce9fa5162ff4
parentc20d7afb366e5d969858fcdcd4b5d5250fa3be91
Merge commit 'origin/upstream' into test

Conflicts:
configure
linux-user/main.c
Makefile
Makefile.target
block.c
block.h
configure
exec.c
linux-user/main.c
target-arm/translate.c
tcg/x86_64/tcg-target.c