Merge branch 'backport' into work
authorMikael Magnusson <mikachu@comhem.se>
Sun, 2 Mar 2008 18:41:32 +0000 (19:41 +0100)
committerMikael Magnusson <mikachu@comhem.se>
Sun, 2 Mar 2008 18:41:32 +0000 (19:41 +0100)
commit9676757a08b3e2e508c47f7795326bda8e54dc53
treefe390424216d8d3db2f95d50b61adc44262f0658
parentfeec8f663f0a11546c2da87575fecc8a88d97ca1
parente4691468cd291a6bd2b489e90eca2be78b8d0c51
Merge branch 'backport' into work

Conflicts:

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