Merge commit '319f08ea7ef9f947f6713dd8934f19515ba36c3a' into upstream-merge
commit5f64c8659c4be3c694714947108bcd4b9c996293
authorAvi Kivity <avi@redhat.com>
Tue, 30 Jun 2009 11:27:44 +0000 (30 14:27 +0300)
committerAvi Kivity <avi@redhat.com>
Tue, 30 Jun 2009 11:29:05 +0000 (30 14:29 +0300)
tree79649292cfd40deca0ec37b58f4e13449634ff19
parente5470d0bc2e9a5cd63b2dc418811546e3dc031ee
parent319f08ea7ef9f947f6713dd8934f19515ba36c3a
Merge commit '319f08ea7ef9f947f6713dd8934f19515ba36c3a' into upstream-merge

* commit '319f08ea7ef9f947f6713dd8934f19515ba36c3a':
  Rename BLOCK_OBJS to block-obj-y

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