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

[Ben Boeckel]

commit 7d469808a0d59d6541d6a5b5e7e209aa6903b30b
Merge: a2c9826 e8706d1
Author: Ben Boeckel <MathStuf at gmail.com>
Date:   Fri Sep 3 21:37:04 2010 -0400

    Merge branch 'master' into f13

 ghc-libmpd.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---