merge from trunk
authorColin Watson <cjwatson@ubuntu.com>
Tue, 18 May 2010 10:14:13 +0000 (11:14 +0100)
committerColin Watson <cjwatson@ubuntu.com>
Tue, 18 May 2010 10:14:13 +0000 (11:14 +0100)
commite6127bed2587f94edd9501438acb19f23a9ce507
tree3280e680634ec8e46dc238f05463b2ad578a2984
parenta800277e8d63dbab8de3f8bd2e8c56ad3e9d5778
parentf4fc97d02a05afa7d88153a2d156a5ea12d71b44
merge from trunk
conf/common.rmk
configure.ac
kern/emu/hostdisk.c