Merge branch 'bare_attribute'
Hans Dieter Pearcey [Wed, 24 Jun 2009 20:43:54 +0000 (16:43 -0400)]

Trivial merge