[python-tgext-crud/f14/master: 4/4] Merge branch 'f13' into f14

[Luke Macken]

commit bc405716b4007af415dc5abfd0dae79e46eea7ea
Merge: 2c8a647 638dc6e
Author: Luke Macken <lmacken at redhat.com>
Date:   Sat Sep 11 13:21:06 2010 -0400

    Merge branch 'f13' into f14
    
    Conflicts:
    	.gitignore
    	python-tgext-crud.spec

 python-tgext-crud.spec |   12 ++++++------
 sources                |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
---