commit d21e11d011673cd0ed57a47162ea29b266a04232 Merge: 53c9280 634f939 Author: Mads Kiilerich <mads at kiilerich.com> Date: Sun Aug 8 23:31:20 2010 +0200 Merge remote branch 'origin/f12/master' Conflicts: tortoisehg.spec ---