[erlang-pgsql/el6/master: 2/2] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit 34fdd768bf94c6afb4350918ed34f1dd3cdcb4f0
Merge: 269970d a09afb5
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Jan 1 04:55:56 2011 +0100

    Merge remote branch 'origin/master' into el6

 erlang-pgsql.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---