AppConfigHeaders: Merge in latest trunk.
authorDean Camera <dean@fourwalledcubicle.com>
Sun, 27 May 2012 17:24:09 +0000 (17:24 +0000)
committerDean Camera <dean@fourwalledcubicle.com>
Sun, 27 May 2012 17:24:09 +0000 (17:24 +0000)

Trivial merge