Merge two tags into one.

Submitted by Eelco Visser on 4 January 2013 at 15:26