Tries to merge smaller events onto larger ones whenever possible, reducing the number of operations that have to be done to complete the merge; part of ref #979 (see comment 24).
Merge branch 'master' of git://yorba.org/shotwell