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

[Pavel Alexeev]

commit e48f4dd0c30b2da68909008ba629c93be8324932
Merge: bb12e14 b3315af
Author: Pavel Alexeev aka Pahan-Hubbitus <pahan at hubbitus.info>
Date:   Tue Aug 10 02:09:15 2010 +0400

    Merge remote branch 'origin/master' into f12

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