AppConfigHeaders: Merge in latest trunk.
authorDean Camera <dean@fourwalledcubicle.com>
Sat, 26 May 2012 16:03:05 +0000 (16:03 +0000)
committerDean Camera <dean@fourwalledcubicle.com>
Sat, 26 May 2012 16:03:05 +0000 (16:03 +0000)

Trivial merge