[commit: ghc] fix#7704: Merge remote-tracking branch 'origin/master' into fix#7704 (f3b9b3f)

[José Pedro Magalhães]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : fix#7704

http://hackage.haskell.org/trac/ghc/changeset/f3b9b3f033052961a923c615600932942dea0177

>---------------------------------------------------------------

commit f3b9b3f033052961a923c615600932942dea0177
Merge: c3ce497 d5f51d8
Author: Jose Pedro Magalhaes <jpm at cs.ox.ac.uk>
Date:   Tue Mar 5 09:42:46 2013 +0000

    Merge remote-tracking branch 'origin/master' into fix#7704

 rts/LdvProfile.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)