Merge branch 'backport' into work
authorMikael Magnusson <mikachu@comhem.se>
Thu, 28 Feb 2008 05:20:50 +0000 (06:20 +0100)
committerMikael Magnusson <mikachu@comhem.se>
Thu, 28 Feb 2008 05:20:50 +0000 (06:20 +0100)
commit163950b23bf796a39870044417ca54d667b6b470
treed6b2a668aa738a3dd0a6e1f38524211e2b45d3b8
parentf857b0eb99471c9123d6e641afafeab5f47700e2
parent573bbb08a63d2f1c1cb873a0746613cfb6fdb560
Merge branch 'backport' into work

Conflicts:

Makefile.am
Makefile.am
openbox/actions/execute.c
openbox/actions/exit.c