[sawfish: 6/6] Merge branch 'teika'

[Christopher Bratusek <chrisb src gnome org>]

commit 2c0bbbe27bd5a24809a3ba12cf6a8e794bb6847c
Merge: 03a3a36 96ccbf1
Author: Christopher Roy Bratusek <zanghar freenet de>
Date:   Sat Sep 25 08:46:22 2010 +0200

    Merge branch 'teika'
    
    Conflicts:
    	ChangeLog

 ChangeLog                                  |   12 ++
 lisp/sawfish/gtk/widgets/scheme-boolean.jl |    7 +-
 lisp/sawfish/gtk/widgets/simple-dialog.jl  |    8 +-
 lisp/sawfish/wm/ext/old-window-menu.jl     |   86 ++++++++++
 man/news.texi                              |  237 ++++++++++++----------------
 man/sawfish-config.1                       |   18 +--
 6 files changed, 214 insertions(+), 154 deletions(-)
---
diff --cc ChangeLog
index ec26635,3fe0e09..939ecab
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,15 +1,19 @@@
+ 2010-09-25  Teika kazura <teika lavabit com>
+ 	* lisp/sawfish/wm/ext/old-window-menu.jl: Resurrected. It was
+ 	removed in commit cf79775e.
+ 
+ 	* lisp/sawfish/gtk/widgets/scheme-boolean.jl: Reverted the last
+ 	commit b961a052fced. (Retaining bugfix.)
+ 
+  	* lisp/sawfish/gtk/widgets/simple-dialog.jl
+ 	* man/news.texi
+ 	* man/sawfish-config.1: News & doc. See git commit 5fafc9680e log
+ 	for the details.
+ 
 +2010-09-23  Christopher Bratusek <zanghar freenet de>
 +	* lisp/sawfish/wm/commands/viewport-extras.jl: export `move-viewport-next'
 +	and `move-viewport-previous' (both required for pager 0.7.5)
 +
  2010-09-21  Christopher Bratusek <zanghar freenet de>
  	* lisp/sawfish/gtk/widgets/scheme-boolean.jl: fixed loading widget-dialog,
  	it's now in simple-dialog. Also change the behaviour a bit: Previously the