transit visas etc

my wife and i have australian passports and will be in transit 6 hours in guangzhou onway to france and on return will stay 2 nights in guangzhou before returning to australia, this is in february 2014. do we need visas or can we get them in guangzhou.
regards, dave