merge trunk
authorColin Watson <cjwatson@ubuntu.com>
Wed, 5 Jan 2011 11:57:17 +0000 (11:57 +0000)
committerColin Watson <cjwatson@ubuntu.com>
Wed, 5 Jan 2011 11:57:17 +0000 (11:57 +0000)
commit80e9f2bce87e433e9f310e1a73e48c68453d5555
tree8e025ddd713dc3541ab69f49af8fd64e36d40da8
parent1e44c52a69d3c94528c3239b137bf9d009056523
parentb3f8d28ad0c629d7ae77318be9fe23f8a618d11f
merge trunk
util/grub-setup.c