use updated and complete macros
use updated and complete macros

git-svn-id: 5c0da1fe89386e88bed5c050d0fac513d4e86e9b@206 f3b90fed-20f5-0310-8406-f4dde2dd57b2

cdsi/grima,cdsi/grima,cdsi/grima,cdsi/grima,cdsi/grima