[zoneminder/f15/master: 3/3] Merge branch 'master' into f15

[Jason ティビツ]

commit 7025e4da6067619cecece033abebd4d6c0781d88
Merge: 8ead503 8185da4
Author: Jason Tibbitts <tibbs at math.uh.edu>
Date:   Fri Mar 25 00:37:55 2011 -0500

    Merge branch 'master' into f15
    
    Conflicts:
    	zoneminder.spec

 .gitignore                        |    1 +
 sources                           |    2 +-
 zoneminder-1.24.3-dbinstall.patch |   22 +++++++++++++---------
 zoneminder-1.24.3-gcc44.patch     |   12 ------------
 zoneminder-1.24.3-noffmpeg.patch  |   13 +++++++------
 zoneminder-1.24.3-runlevel.patch  |   16 ++++++++--------
 zoneminder-svn-checkout.sh        |   10 ++++++++++
 zoneminder.spec                   |   21 +++++++++++++++------
 8 files changed, 55 insertions(+), 42 deletions(-)
---