Fix Merge from cocoatutorials/gso13trunk

git-svn-id: svn://dev.exiv2.org/svn@3118 b7c8b350-86e7-0310-a4b4-de8f6a8f16a3