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

[Ben Boeckel]

commit ec9d88a88a3d196f3b6020912253e2ec911a0402
Merge: 0f111c8 c8e3446
Author: Ben Boeckel <MathStuf at gmail.com>
Date:   Fri Sep 3 17:58:28 2010 -0400

    Merge branch 'master' into f13

 ghc-hinotify.spec |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---