commit 4ff40bb277ac9ef4c03e41032bd350b9cb45c44b Merge: 779d737 a09afb5 Author: Robert Scheck <robert at fedoraproject.org> Date: Sat Jan 1 04:56:32 2011 +0100 Merge remote branch 'origin/master' into el5 erlang-pgsql.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) ---