commit 0b24250dd85e1d53f9f0a83893300e0d48940052 Merge: dc4764d a09afb5 Author: Robert Scheck <robert at fedoraproject.org> Date: Sat Jan 1 04:57:14 2011 +0100 Merge remote branch 'origin/master' into el4 erlang-pgsql.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) ---