iPhone 4S using 3G to download songs from iCloud after iOS 5.1 update
You need to turn off "Use Cellular Data" in the "Music" section in Settings. Then, when you go to play a song from iTunes Match when you're on 3G, it'll give you a message saying you need to be on Wi-Fi.