Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
	lib/util.php

diff --cc lib/util.php
index 0ed0688eb50d9458ee742142acbc5f233efd7958,a4865c46c19252211bbe4165100de963c9688533..65bc6544daf6d63ed85de10d3ad9ffb5dbc75e24
--- 1/lib/util.php
--- 2/lib/util.php
+++ b/lib/util.php
@@@ -61,8 -61,8 +61,7 @@@ function common_init_language(
      $language = common_language();
      $locale_set = common_init_locale($language);
      setlocale(LC_CTYPE, 'C');
- 
 -    
 -    // So we don't have to make people install the gettext locales
 +    // So we do not have to make people install the gettext locales
      $path = common_config('site','locale_path');
      bindtextdomain("statusnet", $path);
      bind_textdomain_codeset("statusnet", "UTF-8");