Canon has announced an update for the firmware, meaning when you do video now you can film at 24-25 frames per second and still be at 1080 video. This is important because it will allow better quality if you do chose to do video. However if you don’t the 5D Mark II can still shoot 21 mega pixel images. You can read more about this at Canon Rumors
Cooper Ricketts Photography Blog 