Merge branch 'master' into next
[hw/telemini] / attribs
2010-11-08 Bdale Garbeeinitial design import