Merge remote branch 'remotes/gullydwarf-cfdv/f368_msg_framework'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 29 Jun 2011 01:09:35 +0000 (20:09 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 29 Jun 2011 01:09:35 +0000 (20:09 -0500)

Trivial merge