am bf81cb91: am a6cce790: Merge "Fix 2325549: Allow up to 4 lines of summary...
am bf81cb91: am a6cce790: Merge "Fix 2325549: Allow up to 4 lines of summary text in Settings" into froyo
Merge commit 'bf81cb91' into kraken
* commit 'bf81cb91':
Fix 2325549: Allow up to 4 lines of summary text in Settings