[zabbix/el6/master: 2/2] Merge branch 'master' into el6

[Dan Horák]

commit 30beff59bb08c8679bb38a72e078c5126248aa33
Merge: 0734753 1504b56
Author: Dan Horák <dan at danny.cz>
Date:   Mon Sep 13 12:05:03 2010 +0200

    Merge branch 'master' into el6

 zabbix-1.8.3-fonts-config.patch |    2 +-
 zabbix.spec                     |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---