Merge branch 'bjorn-cleanups' into release
authorLen Brown <[email protected]>
Sun, 5 Apr 2009 05:38:42 +0000 (01:38 -0400)
committerLen Brown <[email protected]>
Sun, 5 Apr 2009 05:38:42 +0000 (01:38 -0400)

Trivial merge