Bug 690725 - make copyright licensing of logos more clear. a=liz.
Merge branch 'gerv-690725'