Commit Graph

678 Commits

Author SHA1 Message Date
stan 257f975558 Commented out some unnecessary debug
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3156 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 10:03:58 +00:00
stan 9472311a38 Fixed some size_t compiler warnings.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3148 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-10-13 15:50:06 +00:00
stan 52b83eb813 Fixed issue with signal loss detection and timestamp label.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3143 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-10-08 22:42:54 +00:00
stan 36dddf22cc Updated to include standard type definitions.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3088 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-07-04 18:09:44 +00:00
stan b079f1e1c6 Updated to use standard types.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3087 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-07-04 18:00:35 +00:00
stan cd16c91ccd Tweaked zone image dumping.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3066 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-05-27 12:18:43 +00:00
stan 60f0136ed3 Merged in image root changes
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3040 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-28 19:16:40 +00:00
stan 2b375ef264 Changes to querying and probing.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3037 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-28 17:38:30 +00:00
stan 72416fc24b Now checks to see if user is in group as well as owner
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3036 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-28 17:38:13 +00:00
stan 5ae6123ba3 Updated deprecated ffmpeg functions.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3018 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-15 17:05:53 +00:00
stan 2c9eeef178 Updated JPEG memory functions to not conflict with new libjpeg8 functions.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3012 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-01-20 14:43:54 +00:00
stan f0e7aaf6db Made mapped memory files not hidden
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2999 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-12-02 18:37:24 +00:00
stan 77fb484226 Fixed some ssize_t format specifiers.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2996 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-12-02 01:29:11 +00:00
stan 00f7799685 Fixed some non-64 bit safe printf specifiers.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2995 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-11-24 11:45:36 +00:00
stan e9d3076785 Removed obsolete commented out line.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2994 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-11-24 11:45:00 +00:00
stan 075257be52 Added stdio.h for vsnprintf if not present
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2993 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-11-24 11:40:45 +00:00
stan e30ae4fa0e Only send http Keep-alive header for http 1.0
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2992 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-11-24 11:40:04 +00:00
stan 30c3c88c55 Remove MS_INVALIDATE from closing msync as not required.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2991 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-11-24 11:31:00 +00:00
stan a786dfeb66 Debug tidying and renaming.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2976 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-14 13:10:14 +00:00
stan 10b01a5062 Added Panic level for debug with stack dump.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2975 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-14 10:01:46 +00:00
stan 2066ad472b Fixied size_t format specifier for 64 bit systems
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2943 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-07-01 12:32:28 +00:00
stan 2c43bde47c Corrected some format specifiers to account for different size of size_t types on 64 bit systems
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2942 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-07-01 12:28:40 +00:00
stan 8cad0dbd6a Updated.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2933 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-24 10:27:28 +00:00
stan 174c82a452 Remove error message if terminated and can't send.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2916 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-09 14:15:02 +00:00
stan 11a1cc2d41 Now supports custom perl install path
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2908 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-08 09:11:56 +00:00
stan 5842ec5bfc Added detection for thread death.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2907 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-03 08:10:28 +00:00
stan c95ff6b6ba Added change running flag to started, and added running to just mean when thread func is going.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2906 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-03 08:10:02 +00:00
stan 3c10237833 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2905 e3e1d417-86f3-4887-817a-d78f3d33393f 2009-05-28 08:47:59 +00:00
stan 034f37cf4b Applied contributed patch.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2890 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-25 18:03:46 +00:00
stan ad77dc2e56 Applied patch to restore camera settings at startup.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2870 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-13 10:43:49 +00:00
stan a02eba25ff Minor mpeg format and config changes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2868 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-08 15:24:39 +00:00
stan 820dce5e42 Updated for decimal frame rates.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2867 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-08 13:47:19 +00:00
stan ca858a8562 Applied patch from 'mitch' to improve error detection when streaming.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2864 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-08 09:47:37 +00:00
stan 17386aa49f Changed case of session cookie header.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2850 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-14 20:20:02 +00:00
stan 4c8352153d Removed srand call and improved error message.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2849 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-14 20:19:36 +00:00
stan 18f196dbcd Added srand initialisation.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2848 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-14 20:18:57 +00:00
stan 72f908c4e7 Changed streaming to dynamically reduce frame rates if streams are sent too slowly. Made low bandwidth montage more resilient.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2844 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-03 12:10:54 +00:00
stan fa5db09a73 FIxed issues with negative FPS affecting streaming.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2839 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-01 19:39:23 +00:00
stan cf30933bb4 Conditional compilation for recent V4L2 addition
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2834 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 14:09:53 +00:00
stan afe253b71a Added V4L2 query
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2827 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 12:57:34 +00:00
stan 41c2889df2 Added query capabilities for V4L2 cameras
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2824 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-30 15:27:15 +00:00
stan e4d00ba189 RTSP fixes and tweaks
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2815 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-27 09:27:24 +00:00
stan 75c654e654 Downgraded to support autoconf 2.59
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2812 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-23 21:59:13 +00:00
stan 20580582b3 Minor header file reorg
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2811 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-23 21:56:30 +00:00
stan c65b50e312 Minor header sort out and libz no longer mandatory.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2809 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-20 12:39:29 +00:00
stan f29e7b7436 Commented out recent redundant pix_format definitions
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2808 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-20 11:33:05 +00:00
stan 3069dc2402 Final timestamp update
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2802 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-09 12:45:32 +00:00
stan 429884741a Updated for timestamps
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2801 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-09 12:32:04 +00:00
stan 73ad3a7097 Changed types/order of stream status structs to work on 64 bit systems.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2797 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-08 14:34:09 +00:00
stan b89b1cfc7c Fixed non-standard for webcam properly
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2785 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-20 18:15:16 +00:00
stan 61089eeeb1 Added authentication hashed logins.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2781 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-19 14:06:39 +00:00
stan ee972ac78a Fixed issue with event section lengths being ignored on alarm and rationalised debug.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2778 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-18 22:05:32 +00:00
stan 28692c1b28 Fixed greyscale issue and don't do format conversion if not required.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2777 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-18 12:30:43 +00:00
stan ff2ac65117 Improved confusing error message.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2776 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-18 12:30:17 +00:00
stan 3a86651627 Reworked multi-buffering etc for V4L multi-sources.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2775 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-17 21:23:27 +00:00
stan 4a17169acd Removed Bandwidth header.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2774 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-17 21:22:51 +00:00
stan bf0d393e1f Added double include wrapper.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2773 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-17 21:22:02 +00:00
stan e64312e48c Corrected so mapped memory files are removed by package script.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2771 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-17 12:32:03 +00:00
stan 9c518efb3d Stopped memory file getting deleted unless zmc restarts. Better overrun detection.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2770 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-17 12:29:51 +00:00
stan 092f8cdbff Made backtracing more helpful.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2769 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-17 12:27:03 +00:00
stan b1b4c8e42d Fixed issue with extra debug not working for components.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2768 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-17 12:26:41 +00:00
stan 9690eb66fe Removed from svn.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2767 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-17 12:26:18 +00:00
stan 5506400519 Applied YUV patch from forum.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2766 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-16 18:33:36 +00:00
stan e0ea59eec5 Fixed RTSP authentication.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2765 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-16 18:21:50 +00:00
stan 3b64c91b57 Don't fail to compile if ffmpeg compiled with swscale, though won't work.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2764 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-16 18:18:37 +00:00
stan d980c3996d Cosmetic
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2763 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-16 18:18:03 +00:00
stan bfc329b96a Changed memcpy to memove where overlaps might occur.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2762 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-16 18:17:19 +00:00
stan 1195e8e27c More multi-cam tweaks.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2757 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-12 22:26:28 +00:00
stan 98b648bfc1 Fixes to multiple cameras on one device.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2756 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-12 21:33:05 +00:00
stan d92c781026 Removed mapped memory file on shutdown.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2755 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-12 21:32:00 +00:00
stan a941e28b37 Updated for latest ffmpeg.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2750 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-09 14:54:09 +00:00
stan 541d4e20e5 Updated for latest ffmpeg
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2748 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-09 14:42:08 +00:00
stan d9542aba28 Removed unecessary Info line.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2747 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-08 17:46:00 +00:00
stan 885c090f12 Removed or conditionally commented out V4L2 pix formats that are nopt in older kernels
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2740 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-04 15:02:47 +00:00
stan cd269623c1 Allow sources with no video standard defined.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2739 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-04 14:44:30 +00:00
stan cd7087aeed Removed optmisation to let browser scale zoomed in images as breaks FF3
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2738 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-04 14:38:05 +00:00
stan c753214450 Added some conditional compilation around ffmpeg stuff.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2733 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 15:02:33 +00:00
stan 4b9d30ca75 Cleaned up multi-camera setup
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2729 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 12:50:37 +00:00
stan 0f5ee9580f Conditional compilation for V4L2 stuff.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2728 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 11:28:03 +00:00
stan f0c76828c0 Removed compiler warning
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2727 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 11:27:35 +00:00
stan e14efbd493 Updated generated files.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2726 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 11:24:01 +00:00
stan dde584a12a Restructured camera capture methods somewhat and revamped V4L stuff a bit.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2724 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 09:48:06 +00:00
stan 21d8d74a28 V4L2 updates
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2723 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-27 11:07:24 +00:00
stan bb872feab4 Added result error checking to frame streaming.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2718 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-21 17:37:39 +00:00
stan 23d82a7e03 Added FFMPEG camera type
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2716 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-20 15:01:32 +00:00
stan 0fcda558dd Updated new RTSP SDP parsing methods.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2715 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-20 15:00:31 +00:00
stan d43d2289ed Changes from updated build tools.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2714 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-20 14:54:50 +00:00
stan f7ebe7a05e Updates for changed SDP parsing method.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2713 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-16 12:18:50 +00:00
stan 549aa39cbb Updated autoconf/make files
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2710 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-06 00:05:56 +00:00
viseon f2ad7cc770 Add offset to replay_rate to make it unsigned
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2708 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 23:56:15 +00:00
stan bcb7166b75 Better handling of RTP stream and thread death.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2704 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 23:14:37 +00:00
stan c83d340ad8 COntrol stream replay rate now two bytes long
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2703 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 23:14:20 +00:00
stan 5bd99df2cf Added symbolic level to hex dump
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2699 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 21:00:26 +00:00
stan 37516f9c95 Added extra byte intolength calculation to avoid infinite loop
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2698 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 20:59:57 +00:00
stan 4a57d09d64 Added checks for return status on read and write functions.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2697 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 20:55:58 +00:00
stan e33fc4cd60 Added proper check for http methods.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2695 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 19:05:35 +00:00
stan fe1c1f3beb Moved some initialisations
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2691 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 18:13:45 +00:00
stan 842398a32f Added checks to return status of some functions.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2690 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 18:13:26 +00:00
stan 55ce645728 Added VARPLAY command to event stream.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2688 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-11-03 13:18:08 +00:00
stan 6d78b17d90 Added CMD_VARPLAY to stream commands
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2687 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-11-03 13:16:47 +00:00