fixed errorneus 'Empty catalog' message
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
updated ChangeLog
Merge branch 'ice-cream-sandwich' into beta-ics

Conflicts:
	ChangeLog
updated ChangeLog
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

Conflicts:
	ChangeLog
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics