I am planning to upgrade to 3.5.2 and have backed everything up. I have a customised version of twenty eleven using a child theme. (see http://www.nadaav.com/n).
I see here that a customised version of the theme will be overwritten on upgrade: http://codex.wordpress.org/Updating_WordPress
Does this include child themes? What's the best way to upgrade to maintain my child theme changes and also general theme options?