Merge commit '6acff7da2b1a22789f23771c411586e4620049df' into upstream-merge
commitb75e4269ec0bec4c97f29aaa6e28f8d1a1f20278
authorAvi Kivity <avi@redhat.com>
Tue, 28 Jul 2009 17:24:53 +0000 (28 20:24 +0300)
committerAvi Kivity <avi@redhat.com>
Tue, 28 Jul 2009 17:24:53 +0000 (28 20:24 +0300)
treee5f6d31b27c02cc7a989721e98fad7a6a26f94e0
parent582e398ee96113705fb9ab04190643fabb8bba38
parent6acff7da2b1a22789f23771c411586e4620049df
Merge commit '6acff7da2b1a22789f23771c411586e4620049df' into upstream-merge

* commit '6acff7da2b1a22789f23771c411586e4620049df':
  simplify TARGET_BASE_ARCH generation

Conflicts:
Makefile.target

Signed-off-by: Avi Kivity <avi@redhat.com>
Makefile.target
configure