Merge remote branch 'remotes/jwandborg/f571_closing_storage_objects'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 6 Sep 2011 02:14:22 +0000 (21:14 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 6 Sep 2011 02:14:22 +0000 (21:14 -0500)

Trivial merge