[sawfish: 8/10] Merge branch 'master' into teika

[Christopher Bratusek <chrisb src gnome org>]

commit 4443444fb7ec846bf92fa50226eb4aafe00d9bf2
Merge: 01e7585... b5b1c8e...
Author: Teika kazura <teika lavabit com>
Date:   Tue Oct 6 12:48:21 2009 +0900

    Merge branch 'master' into teika
    
    Conflicts:
    	ChangeLog

 ChangeLog                           |   25 +
 KEYBINDINGS                         |   30 +-
 Makedefs.in                         |    4 -
 OPTIONS                             |   12 +-
 config.h.in                         |    6 -
 configure.in                        |   36 -
 lisp/sawfish/wm/ext/audio-events.jl |    6 +-
 lisp/sawfish/wm/frames.jl           |    5 +
 lisp/sawfish/wm/keymaps.jl          |   51 +
 lisp/sawfish/wm/menus.jl            |    2 +-
 lisp/sawfish/wm/util/play-audio.jl  |   32 +-
 man/news.texi                       |   26 +-
 man/sawfish.texi                    |   14 +-
 po/de.po                            | 5756 +++++++++++++----------------------
 sawfish.ebuild.in                   |    4 +-
 src/Makefile.in                     |   10 +-
 src/play-sample.c                   |  549 ----
 17 files changed, 2276 insertions(+), 4292 deletions(-)
---
diff --cc ChangeLog
index a4222f2,421742c..1fd7e61
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,28 +1,38 @@@
+ 2009-10-01  Christopher Bratusek <zanghar freenet de>
+ 	* configure.in
+ 	* OPTIONS
+ 	* src/play-sample.c
+ 	* src/Makefile.in
+ 	* Makedefs.in
+ 	* sawfish.ebuild.in
+ 	* lisp/sawfish/wm/util/play-audio.jl: removed built-in audio support, using /usr/bin/paplay by default
+ 
+ 	* man/sawfish.texi
+ 	* KEYBINDINGS
+ 	* lisp/sawfish/wm/frames.jl
+ 	* lisp/sawfish/wm/keymaps.jl: added new buttons (frame-classes) (+ keymaps and docs):
+                                       - sticky button
+ 				      - lock button
+ 				      - rename button
+ 				      - move/resize button
+ 				      - raise/lower button
+ 
+ 	* lisp/sawfish/wm/menus.jl: string change in customize-menu
+ 
+ 	* man/news.texi: updated
+ 
+ 	* OPTIONS: updated
+ 
 +2009-10-01  Teika kazura <teika lavabit com>
 +	* OPTIONS
 +	* lisp/sawfish/wm/frames.jl
 +	* lisp/sawfish/wm/windows.jl
 +	* man/sawfish.texi: Doc on window types.
 +
 +2009-09-30  Teika kazura <teika lavabit com>
 +	* OPTIONS
 +	* lisp/sawfish/wm/windows.jl: Docstring of 'dont-avoid-ignored' is corrected.
 +
  2009-09-29  Jeremy Hankins <nowan nowan org>
  	* lisp/sawfish/cfg/apply.jl
  	* lisp/sawfish/cfg/config.jl