[schroedinger/f13/master: 4/4] Merge branch 'master' into f13

[Fabian Deutsch]

commit 6bd6283bd91c8e206a282521bc8f6cae41bfbeba
Merge: e72c26d 005506a
Author: Fabian Deutsch <fabian.deutsch at gmx.de>
Date:   Wed Oct 27 23:16:27 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	schroedinger.spec
    	sources
    
    Signed-off-by: Fabian Deutsch <fabian.deutsch at gmx.de>

 .gitignore                      |    1 +
 schroedinger-no-testsuite.patch |   15 ---------------
 schroedinger.spec               |   25 ++++++++++++++++---------
 sources                         |    2 +-
 4 files changed, 18 insertions(+), 25 deletions(-)
---