Casino Royale (2006) 1 disc vs. 2 disc

[JohnCarpenterLives]

I am in the United States, I would really like to get the uncut version of Casino Royale (2006), and I'd like to get it from Australia!

I know there are two editions:
1-disc standard and 2-disc Collector's/Deluxe/Limited/whatever-you-call-it

I'd love to have the special features but the most important thing for me is that the film is uncut.
I know the single disc edition is uncut. Is the 2-disc edition also the uncut version of the film?
If so I would love to get the 2-disc!

Thanks for the help!
If anyone could also direct me to any sites, or provide me with links to where I can purchase whichever edition I need I would be very grateful!