Fixed possible stash merging issue (if a string pool expand was executed during the merge)
Fixed possible stash merging issue (if a string pool expand was executed during the merge)



git-svn-id: f51da0a001186cec07b4b752117870782f8907d5@518 90b9ba79-5a2e-4b5c-bd45-faaa64a2bb6e

xroche/coucal