Merge from trunk
authorRobert Millan <rmh@aybabtu.com>
Sat, 12 Dec 2009 00:07:45 +0000 (00:07 +0000)
committerRobert Millan <rmh@aybabtu.com>
Sat, 12 Dec 2009 00:07:45 +0000 (00:07 +0000)
commit37ba589a4e50b671b44beef3b138c80cc870405b
tree2c037072bb3f76fc60e61c26fd0af43ab876874b
parent53e08cc54c17eaf34d9ff95e71d7ea142be176bf
parent2a4bfcf0da2ab1c084ce33e43595afbc053ab46b
Merge from trunk
conf/any-emu.rmk
conf/common.rmk
util/grub-install.in