new info fields in preferences dialog
Merge branch 'master' into ice-cream-sandwich
updated ChangeLog
Merge branch 'master' into ice-cream-sandwich