Note: Resolved merge conflict Split from commit 31296c60 from Svenstaro branch Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Includes vesamenu config... needs testing Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>