Merging kreczko_swatch_arguments_take_2, Refs #767


git-svn-id: svn+ssh://svn.cern.ch/reps/cactus/trunk/cactuscore/swatch@31325 4525493e-7705-40b1-a816-d608a930855b