merge r7482 from trunk
authorDana Jansens <danakj@orodu.net>
Sun, 10 Jun 2007 18:06:44 +0000 (18:06 +0000)
committerDana Jansens <danakj@orodu.net>
Sun, 10 Jun 2007 18:06:44 +0000 (18:06 +0000)
commit0c8b0df544a88e1dc5dacb3d4a3045393e972484
treea0b9ddfb1b7a99cd5fc008eda5bc649ce94774fb
parentb8954e89716b473926c1e3997330fed6c4e002ea
merge r7482 from trunk
openbox/action.c
openbox/focus_cycle.c