Crash's suggestion (long press on the album name) has taken care of 95% of my albums, but some still play out of order. I've double-checked the file tags and they're as they should be. Any other ideas?
I had the problem where the songs for each album were listed (and played) in alphabetical order instead of track order. But that problem went away when I upgraded from 2.1 to 2.2.