[ocaml-lablgtk/f14/master: 3/3] Merge remote branch 'origin/master' into f14

[Adam Tkac]

commit 3a749927ffd1c6c54e71ae0b3faa4fc6a3d2ae00
Merge: 9846895 026caee
Author: Adam Tkac <atkac at redhat.com>
Date:   Tue Aug 24 15:07:37 2010 +0200

    Merge remote branch 'origin/master' into f14
    
    Conflicts:
    	ocaml-lablgtk.spec
    
    Signed-off-by: Adam Tkac <atkac at redhat.com>

 lablgtk-buildfix.patch |   83 ++++++++++++++++++++++++++++++++++++++++++++++++
 ocaml-lablgtk.spec     |    8 ++++-
 2 files changed, 90 insertions(+), 1 deletions(-)
---