Merge branch 'installfix' into phcoder
commit14e42a553dc4845641ba9376eeff67130e614e79
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 17 Jul 2009 16:22:38 +0000 (17 18:22 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 17 Jul 2009 16:22:38 +0000 (17 18:22 +0200)
treeabaac8da16b054a21adf3e2188a29a3afd66d188
parentc028534959b5e6f64f32a24b4f7087b83e933032
parentf7907e7dfed04e28696d764433ebf155b873638f
Merge branch 'installfix' into phcoder

Conflicts:
ChangeLog
ChangeLog
util/i386/pc/grub-setup.c