dslv attrs
Merge branch 'beta' of github.com:geometer/FBReaderJ into beta
compilation issue
Merge branch 'beta' into beta-ics
Merge branch 'beta-ics' into yotabeta
API method saveBookmark has gone
unused method
Merge branch 'beta' into beta-ics
Merge branch 'beta-ics' into yotabeta
API method storeTextPosition() has gone
fbreader intents cleanup
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
	src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
synchronization with ics branch
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/BookmarksActivity.java
	src/org/geometerplus/android/fbreader/FBReader.java
	src/org/geometerplus/android/fbreader/api/ApiServerImplementation.java
Merge branch 'beta' into beta-ics

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
	src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'beta-ics' into yotabeta

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
Merge branch 'yota2' into yotabeta