merged patch
from http://code.google.com/p/opencollada/issues/detail?id=168