Merge branch 'review' of openbox.org:public_git/openbox into review
Dana Jansens [Wed, 26 Oct 2011 14:32:01 +0000 (10:32 -0400)]

Trivial merge