Merged r9481:9518 on jblum/grc_reorganize into trunk. Reorganized grc source under...