[tk/f16: 3/3] Merge branch 'master' into f16

Thu Nov 10 16:46:44 UTC 2011

commit 0a451b7e8bae9c1a6ab50d1100bf27cee40ed265
Merge: 324d1ba 4194a71
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Thu Nov 10 17:30:31 2011 +0100

    Merge branch 'master' into f16
    
    Conflicts:
    	tk.spec

 .gitignore |    2 +-
 sources    |    2 +-
 tk.spec    |    7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)
---