Merge /home/roy/CVS/7448/Open_Source/u-boot.git.dev