Merge branch 'hmq' of http://192.168.3.209/zhangshengli/androidgroup into zsl2

Conflicts:
	imageLoader/src/com/nostra13/universalimageloader/cache/disc/DiskCache.java

imageLoader/.classpath

-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>

imageLoader/src/com/nostra13/universalimageloader/cache/disc/DiskCache.java

@@ -26,7 +26,11 @@ import java.io.InputStream;
  * Interface for disk cache
  *
  * @author Sergey Tarasevich (nostra13[at]gmail[dot]com)
+<<<<<<< HEAD
  * @since 1.9.1
+=======
+ * @since 1.8.2
+>>>>>>> 60c2ed3dd69f390d535e0e9eefcf05fcfbf21102
  */
 public interface DiskCache {
 	/**