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