Merged these to 4.3.x branch

diff --git a/NEWS b/NEWS
index 4decc6b56c014b6e367eaa364b0f8db9c3ac0a9c..46669a165e4401a0ff3241751c8cbfbe9e3a9518 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,7 +12,6 @@ PHP 4                                                                      NEWS
 - Changed ext/mcrypt to require libmcrypt version 2.5.6 or greater. (Derick)
 - Changed uniqid() parameters to be optional and allow any prefix length.
   (Marcus)
-- Added improved JPEG 2000 support for getimagesize(). (Marcus, Adam Wright)
 - Added strpbrk() function. Searches a string for a list of characters. (Ilia)
 - Added stream_get_line() function. Reads either the specified number of bytes
   or until the ending string is found. (Ilia)
@@ -41,7 +40,6 @@ PHP 4                                                                      NEWS
   . Support for float modifier.
   . Detection of numeric values inside strings passed as high & low.
   . Proper handle the situations where high == low.
-- Added XBM support for GetImageSize(). (Marcus)
 - Added XBM support for bundled GD library. (Marcus)
 - Added imagefilter() function. Allows application of various filters.
   Only available with bundled GD. (Pierre-Alain Joye, Ilia)