[root]/GDE/SATIVA/sativa/epac/ete2
* partial merge from sativa branch - log:branches/sativa@14543:14543
2 lines of code changed in 2 files: