Merge ../MormonChannel
authorepage <epage@1a2a05ed-a369-0410-af37-574249971199>
Fri, 28 May 2010 02:42:35 +0000 (02:42 +0000)
committerepage <epage@1a2a05ed-a369-0410-af37-574249971199>
Fri, 28 May 2010 02:42:35 +0000 (02:42 +0000)
git-svn-id: https://dev.lds.org/svn/mormonchannel/trunk/maemo/trunk@501 1a2a05ed-a369-0410-af37-574249971199


Trivial merge