Merge remote branch 'remotes/jwandborg/storage_split_fix'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 2 Oct 2011 01:54:24 +0000 (20:54 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 2 Oct 2011 01:54:24 +0000 (20:54 -0500)

Trivial merge