Merge remote branch 'remotes/elrond/dev/mount_storage'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 9 Aug 2011 01:12:27 +0000 (20:12 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 9 Aug 2011 01:12:27 +0000 (20:12 -0500)

Trivial merge