No worries Spaniard.

I'm still waiting for the day i get my hands on the 7D. :angel:
You might want to consider this setup: 10-22 + 24-105
L 
Its a "goodenuf" setup for landscapes, vacation, etc. If you wanna do portraits along the way, you may want to throw in a 50 1.8.
Should you find the canon 10-22 a bit too pricey, (i noe i did!) you can consider the sigma 10-20. its about $400 cheaper (2nd hand) but you do need to check and test for a sharp copy.
There are also some other UWA or ultra wides in the market such as the Tokina 11-16 f2.8, 12-24 and the tamron 11-18. Some might say that 1mm wont make much a difference, but if you wanna go wide, and punchy, dramatic pictures, might as well go all the way to 10mm!

Ultrawides will change how you shoot.
Hope this helps, and all the best.