Merge 78972 from /trunk
------------------------------------------------------------------------ r78972 | jhunold | 2012-06-16 14:05:44 +0200 (Sa, 16 Jun 2012) | 3 lines
Fix regressions introduced in r78802.
Reference #6940. Rename TIME_UTC to TIME_UTC_ ------------------------------------------------------------------------