Merge remote branch 'remotes/jwandborg/f403_ability_to_delete'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 31 Aug 2011 01:16:47 +0000 (20:16 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 31 Aug 2011 01:16:47 +0000 (20:16 -0500)

Trivial merge