Erik Forkalsrud 984bc2f72c Merge branch 'master' of ssh://aha/home/gitroot/album ... Conflicts: src/main/java/org/forkalsrud/album/video/MovieCoder.java		2011-07-03 01:18:19 -07:00
..
org/forkalsrud/album	Merge branch 'master' of ssh://aha/home/gitroot/album	2011-07-03 01:18:19 -07:00