nikrou a820112d59 merge from branch-1_6 into trunk: ... svn merge -r1141:1142 git-svn-id: http://piwigo.org/svn/trunk@1143 68402e56-0260-453c-a942-63ccdbb3a9ee		2006-04-09 14:50:14 +00:00
..
yoga	merge from branch-1_6 into trunk:	2006-04-09 14:50:14 +00:00