[cvsps/el5/master: 14/15] Merge commit '00b5712ba4b41ef0dd2ef8d193c66badead1dc91' into el5

[Michel Alexandre Salim]

commit d11c4a6efdd7a30cf0f07e07b388b2bbe4aa2a39
Merge: d8aed51 00b5712
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Fri Mar 18 16:27:28 2011 +0100

    Merge commit '00b5712ba4b41ef0dd2ef8d193c66badead1dc91' into el5
    
    Conflicts:
    	.gitignore
    	cvsps.spec

 .gitignore                       |    2 +-
 cvsps-2.2b1-dynamic-logbuf.patch |  133 ++++++++++++++++++++++++++++++++++++++
 cvsps-2.2b1-man.patch            |   29 ++++++++
 cvsps.spec                       |   42 ++++++++++--
 sources                          |    2 +-
 5 files changed, 198 insertions(+), 10 deletions(-)
---