compilation issue
Merge branch 'master' into ice-cream-sandwich
compilation issue
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/fbreader/formats/ExternalFormatPlugin.java