Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug #61480 test bug - ext/gd/tests/bug48555.phpt
  updated the NEWS with the latest fileinfo changes

Conflicts:
	NEWS

Author: weltling

ext/gd/tests/bug48555.phpt

@@ -10,10 +10,22 @@ Bug #48555 (ImageFTBBox() differs from previous versions for texts with new line
 $cwd = dirname(__FILE__);
 $font = "$cwd/Tuffy.ttf";
 $box = ImageFTBBox(14, 0, $font, "Text without line-break");
-echo 'Top without line-break: ' . $box[7] . "\n";
+//echo 'Top without line-break: ' . $box[7] . "\n";
+$without_line_break = $box[7];
 $box = ImageFTBBox(14, 0, $font, "Text with\nline-break\none more");
-echo 'Top with line-break: ' . $box[7] . "\n";
+//echo 'Top with line-break: ' . $box[7] . "\n";
+$with_line_break = $box[7];
+
+var_dump($without_line_break);
+var_dump($with_line_break);
+if ($with_line_break==$without_line_break) {
+  echo "with line break == without line break".PHP_EOL;
+} else {
+  echo "with line break != without line break".PHP_EOL;	
+}
+
 ?>
 --EXPECTF--
-Top without line-break: -14
-Top with line-break: -14
+int(-%d)
+int(-%d)
+with line break == without line break