[ghc-libmpd/f13/master: 2/2] Merge branch 'master' into f13

[Ben Boeckel]

commit a2c98266ea837e5e41bcc0eb7c15a3c0103b6820
Merge: 6a54475 e81fd1c
Author: Ben Boeckel <MathStuf at gmail.com>
Date:   Fri Sep 3 17:56:56 2010 -0400

    Merge branch 'master' into f13

 ghc-libmpd.spec |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---