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

Conflicts:
	install.php
	lib/noticeform.php

diff --cc install.php
index c2ca7e11967e45a04acbf6fcdf7a69b354534d50,3786b6db1764f4d0f8c7051af754e56c1895ff79..c2a5bb29ee394f392abe062ebf355f6d64b5fecc
--- 1/install.php
--- 2/install.php
+++ b/install.php
@@@ -244,7 -244,7 +244,7 @@@ function main(
   */
  function haveExternalLibrary($external_library)
  {
-     if (isset($external_library['include']) && ! @include_once $external_library['include'] ) {
 -    if(isset($external_library['include']) && ! haveIncludeFile($external_library['include'])){
++    if (isset($external_library['include']) && !haveIncludeFile($external_library['include'])) {
          return false;
      }
      if (isset($external_library['check_function']) && ! function_exists($external_library['check_function'])) {

diff --cc lib/noticeform.php
index ce8f9c6530759c343afdb6edbe5311aeb0199cd9,62320dd60230695c098f5c742fa2b350c1c325e6..186330bf1c783f430449ff046b0f2d79d1ada9ca
--- 1/lib/noticeform.php
--- 2/lib/noticeform.php
+++ b/lib/noticeform.php
@@@ -90,7 -90,6 +90,7 @@@ class NoticeForm extends For
          $this->action  = $action;
          $this->content = $content;
          $this->inreplyto = $inreplyto;
-         
++
          if ($user) {
              $this->user = $user;
          } else {