[cvsps/el5/master: 15/15] Merge branch 'master' into el5

[Michel Alexandre Salim]

commit f762ac49449efe7aad761df0680e9845d7afa3a6
Merge: d11c4a6 4793d71
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Fri Mar 18 16:27:32 2011 +0100

    Merge branch 'master' into el5

 cvsps-2.2b1-bufferoverflow.patch |   65 ++++++++++++++++++++++++++++++++++++++
 cvsps.spec                       |   13 ++++++-
 2 files changed, 76 insertions(+), 2 deletions(-)
---