[dwm/f14/master: 8/8] Merge branch 'master' into f14

[Petr Sabata]

commit a3d639b2f26e8d9aead7edf66013aba69dffd3c0
Merge: 8e397b2 1351647
Author: Petr Sabata <psabata at redhat.com>
Date:   Fri Nov 26 14:51:08 2010 +0100

    Merge branch 'master' into f14
    
    Conflicts:
    	dwm-start
    	dwm.spec

 dwm-start |   45 +++++++++++++++++++++++++++++++++++----------
 dwm.spec  |    6 +++++-
 2 files changed, 40 insertions(+), 11 deletions(-)
---