Merge commit 'window-manager/master'
authorJohn Darrington <john@darrington.wattle.id.au>
Sun, 22 Feb 2009 05:32:33 +0000 (14:32 +0900)
committerJohn Darrington <john@darrington.wattle.id.au>
Sun, 22 Feb 2009 05:32:33 +0000 (14:32 +0900)

Trivial merge