From: Dana Jansens <danakj@orodu.net>
Date: Sat, 21 Nov 2009 21:56:07 +0000 (-0500)
Subject: Merge branch 'backport' into work
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=4bf6b1b551be744be4fbe4d1faab5be12d051378;hp=4bf6b1b551be744be4fbe4d1faab5be12d051378;p=chaz%2Fopenbox

Merge branch 'backport' into work

Conflicts:
	openbox/popup.c
---