Merge remote-tracking branch 'origin/master' into i18n-xul-values
authorPasi Kallinen <pasi.kallinen@pttk.fi>
Mon, 3 Jun 2013 08:28:28 +0000 (11:28 +0300)
committerPasi Kallinen <pasi.kallinen@pttk.fi>
Mon, 3 Jun 2013 08:28:28 +0000 (11:28 +0300)

Trivial merge