bring in common from DRI trunk
1 file changed