AppConfigHeaders: Merge in minor changes from trunk.
authorDean Camera <dean@fourwalledcubicle.com>
Sat, 12 May 2012 16:13:16 +0000 (16:13 +0000)
committerDean Camera <dean@fourwalledcubicle.com>
Sat, 12 May 2012 16:13:16 +0000 (16:13 +0000)

Trivial merge