AppConfigHeaders: Merge in latest trunk.
authorDean Camera <dean@fourwalledcubicle.com>
Mon, 21 May 2012 20:48:57 +0000 (20:48 +0000)
committerDean Camera <dean@fourwalledcubicle.com>
Mon, 21 May 2012 20:48:57 +0000 (20:48 +0000)

Trivial merge