[erlang-pgsql/el4/master: 8/8] Merge remote branch 'origin/master' into el4

[Robert Scheck]

commit dc4764d6c47cd3b1b2f97b0fc1cbf998f8a9239e
Merge: 683096b cc4feb6
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Dec 30 03:17:56 2010 +0100

    Merge remote branch 'origin/master' into el4
    
    Conflicts:
    	erlang-pgsql.spec
    	sources

 erlang-pgsql.spec |   49 ++++++++++++++++++++++++-------------------------
 sources           |    2 +-
 2 files changed, 25 insertions(+), 26 deletions(-)
---