[merge request] Two commits on my branch

[Teika Kazura <teika lavabit com>]

Hi. Please merge my branch by:
------------------------------------------------------------------------
git remote add gitorious git gitorious org:sawfish/sawfish.git
git fetch gitorious
git branch --track teika gitorious/master
git merge teika
------------------------------------------------------------------------