Merge remote branch 'remotes/willkg/459_lgpl'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 31 Jul 2011 20:50:25 +0000 (15:50 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 31 Jul 2011 20:50:25 +0000 (15:50 -0500)

Trivial merge