[openbabel: 15/15] Merge remote branch 'origin/el5/master'

[Dominik Mierzejewski]

commit 22b29628880edecf4539c46f8d46f2d20ef5e68c
Merge: 3ba0c74 491ac9c
Author: Dominik Mierzejewski <dominik at greysector.net>
Date:   Sun Sep 5 13:52:07 2010 +0200

    Merge remote branch 'origin/el5/master'
    
    Conflicts:
    	.gitignore

 .gitignore |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---