[zoneminder/f16: 2/2] Merge branch 'master' into f16

[Jason Tibbitts]

commit 820d8b737ea1b9cf96873f804ede8b742aee03d5
Merge: c78b696 c0b340d
Author: Jason Tibbitts <tibbs at math.uh.edu>
Date:   Thu Sep 15 18:24:35 2011 -0500

    Merge branch 'master' into f16

 zoneminder.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---