Code

Merge from trunk.
authorJon A. Cruz <jon@joncruz.org>
Sat, 18 Dec 2010 06:03:56 +0000 (22:03 -0800)
committerJon A. Cruz <jon@joncruz.org>
Sat, 18 Dec 2010 06:03:56 +0000 (22:03 -0800)
commitc580a96092327174256078a5ca30582608e82be7
tree565f7044566ab5cc8466a2302414a65a9ae61ddd
parentb947b86feae33a7df233d6818a0b121611127cad
parent95bed3486f6506adc27bb31ced896b8d7a5f6204
Merge from trunk.
src/verbs.cpp
src/widgets/desktop-widget.cpp