Merge commit '6ffca3534c7b12bf503529bf50b53cfc6c728ff7' * commit '6ffca3534c7b12bf503529bf50b53cfc6c728ff7': do not merge: update API for Josh's optimizations for Eclair
This commit is contained in:
Merge commit '6ffca3534c7b12bf503529bf50b53cfc6c728ff7' * commit '6ffca3534c7b12bf503529bf50b53cfc6c728ff7': do not merge: update API for Josh's optimizations for Eclair