Merged Git support branch (r1200 to r1226).
Authored by: jplang 2008-03-12
Parent: [r1235]
Child: [r1237]