AppConfigHeaders: Merge in latest main.
authorDean Camera <dean@fourwalledcubicle.com>
Sun, 13 May 2012 15:04:50 +0000 (15:04 +0000)
committerDean Camera <dean@fourwalledcubicle.com>
Sun, 13 May 2012 15:04:50 +0000 (15:04 +0000)

Trivial merge