Merge branch 'backport' into work
authorMikael Magnusson <mikachu@comhem.se>
Wed, 23 Apr 2008 14:41:35 +0000 (16:41 +0200)
committerMikael Magnusson <mikachu@comhem.se>
Wed, 23 Apr 2008 15:07:10 +0000 (17:07 +0200)
commit6799c67c07e99c440f549802f60d9f16995ab711
tree096d1066947d6e8bc1278166b94b2de8b6cd684f
parent661a53cb6843d02f3373feab91052c47397bb6ed
parenta7bbdf7d6199d1289f5ecc1b4e25632d88d75387
Merge branch 'backport' into work

Conflicts:

openbox/config.c
openbox/keyboard.c
openbox/moveresize.c
openbox/config.c
openbox/keyboard.c
openbox/moveresize.c
render/image.c