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

[Robert Scheck]

commit 69de4301d1d3c3a1ef8396db002c3a46136ed166
Merge: 2f6e544 a09afb5
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Jan 1 04:55:22 2011 +0100

    Merge remote branch 'origin/master' into f13

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