[ccze/el6/master: 8/8] Merge remote branch 'origin/master' into el6

[Pavel Alexeev]

commit 4bbae3dcc68ce33367c5a76566d1ecb9934048c6
Merge: 28dfa47 b3315af
Author: Pavel Alexeev aka Pahan-Hubbitus <pahan at hubbitus.info>
Date:   Tue Aug 10 11:28:58 2010 +0400

    Merge remote branch 'origin/master' into el6

 ccze-opts.diff |   29 +++++++++++++++++++++++++++++
 ccze.spec      |    8 +++++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---