overlooked a merge conflict in PopulationAgentSource
Authored by: vsp_nagel 2014-10-06
Parent: [r30493]
Child: [r30495]