merge trunk
authorColin Watson <cjwatson@ubuntu.com>
Tue, 11 Jan 2011 16:00:45 +0000 (10:00 -0600)
committerColin Watson <cjwatson@ubuntu.com>
Tue, 11 Jan 2011 16:00:45 +0000 (10:00 -0600)
commit6b978c4f04be82e92fcdb9afcce6c18af65f8e74
tree795ef593bfc027f1b57de1de19ccf2e2337767d9
parentb7d86d53c4645b0ad2fdab281468a3b549416b58
parent86205c94c3f85579f56b005896c4ad3cf0c69d00
merge trunk
grub-core/Makefile.core.def