Removal of the svn_merge branch as it has now been merged to trunk.
Authored by: bugman 2013-11-27
Parent: [r21660]
Child: [r21662]