Although I foresee a new 5D model in the very near future with all the features of the 7D but with the 5D full size sensor, Canon will release this month a significant free firmware upgrade.
http://www.dpreview.com/news/1003/10030201canoneos5dmkiifirmware.asp
http://www.dpreview.com/news/1003/10030201canoneos5dmkiifirmware.asp