Merge /home/roy/CVS/7448/Open_Source/u-boot.git.dev
authorroy zang <tie-fei.zang@freescale.com>
Mon, 4 Dec 2006 15:57:35 +0000 (23:57 +0800)
committerZang Tiefei <roy@bus.ap.freescale.net>
Mon, 4 Dec 2006 15:57:35 +0000 (23:57 +0800)

Trivial merge