Merge: 3.0.x@3105 to trunk
- Fixes SDK-15764 and SDK-15765 for trunk as well.

Files:
modified: /flex/sdk/trunk/modules/antTasks/src/flex/ant/FlexTask.java (try)