[bucardo/el6: 3/3] Merge branch 'master' into el6

[Itamar Reis Peixoto]

commit effff30d78dbe59b41d0fb9dc9e19ce4cf2b3f0e
Merge: 0bb7f71 2a1c3f8
Author: Itamar Reis Peixoto <itamar at ispbrasil.com.br>
Date:   Thu Jul 14 14:45:08 2011 -0300

    Merge branch 'master' into el6

 .gitignore   |    2 ++
 bucardo.spec |   11 ++++++++---
 sources      |    4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)
---