Bug 1094179 - use uriFixup for trimURL, r=dao

--HG--
extra : rebase_source : 2b779b615854513d0bfdce6f13fc56f00e69d29d
Bug 1097543 - tabpanel style should also override color because windows/linux re-set the color to -moz-dialogtext there, r=dao

--HG--
extra : rebase_source : bc4c63b7c77a37c81003ef43a746ebf7ab5efbd8