Merge branch 'taglib2' into tonumber4-merge

Conflicts:
	ConfigureChecks.cmake
	config-taglib.h.cmake

taglib/asf/asfattribute.h

@@ -205,7 +205,7 @@ namespace TagLib
       ByteVector render(const String &name, int kind = 0) const;
 
       class AttributePrivate;
-      RefCountPtr<AttributePrivate> d;
+      TAGLIB_SHARED_PTR<AttributePrivate> d;
     };
   }
 

taglib/asf/asfpicture.h

@@ -231,7 +231,7 @@ namespace TagLib
 #endif
     private:
       class PicturePrivate;
-      RefCountPtr<PicturePrivate> d;
+      TAGLIB_SHARED_PTR<PicturePrivate> d;
     };
   }
 }