[cpdup/el5/master: 14/14] Merge branch 'master' into el5

[Michel Alexandre Salim]

commit 18210b49d2021b6bdbdaa07c1819dd6454f98cb8
Merge: 2a429aa e6c4c16
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Tue Nov 2 20:00:13 2010 +0100

    Merge branch 'master' into el5

 .gitignore             |    2 +-
 Makefile.linux         |    4 +-
 cpdup-1.14-typos.patch |   38 ----------------------------------
 cpdup-1.17-glibc.patch |   53 ++++++++++++++++++++++++++++++++++++++++++++++++
 cpdup-1.17-typos.patch |   20 ++++++++++++++++++
 cpdup.spec             |   29 +++++++++++++++++---------
 sources                |    2 +-
 strlcpy.c              |   53 ++++++++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 149 insertions(+), 52 deletions(-)
---