merge trunk
authorColin Watson <cjwatson@ubuntu.com>
Mon, 14 Mar 2011 22:01:32 +0000 (22:01 +0000)
committerColin Watson <cjwatson@ubuntu.com>
Mon, 14 Mar 2011 22:01:32 +0000 (22:01 +0000)
commit7bdeb3987a52fcfd3b6eaaca3240b3f7002f07a7
tree3ca12619c5cfcbae5282b80e14b99316b830089b
parent6f4b2814bf2e3d531718dbca19559b43056e3322
parent9b43bf396a61b60a0ee4b8a1591634b1120b8906
merge trunk
grub-core/partmap/msdos.c
util/grub-setup.c