svn-popups
c7906147 · Merging changes from /branches/redesign up to r690. ·