enriquec
committed
on 15 Jun 05
Adding merge implementations for photo album