Merge with http://www.psyent.com/git/uboot (NIOS2 - Scott McNutt)