Merge branch 'backport' into 3.4
authorMikael Magnusson <mikachu@comhem.se>
Sun, 2 Mar 2008 16:25:13 +0000 (17:25 +0100)
committerMikael Magnusson <mikachu@comhem.se>
Sun, 2 Mar 2008 16:25:13 +0000 (17:25 +0100)
commit89d433860ce95fe195efa7b56bb740e056728b61
treed1c8d713bd8bb14e945b036e2a9546c4f36fb634
parentb137c4e8c744c4f05cdc34e69adb8e650059cc4c
parent0e3ad6344548bec9259a11b2224930b1d36e8c03
Merge branch 'backport' into 3.4

Conflicts (these changes don't apply at all to 3.4, so ignored them):

openbox/actions/desktop.c
openbox/actions/if.c