Fixed #456. Merged the optimizations for APM's
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 11 Nov 2014 14:21:04 +0000 (22:21 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 11 Nov 2014 14:21:04 +0000 (22:21 +0800)
xgene-1 (aarch64).
Merge branch 'benedikt-huber-dave-patch' into develop


Trivial merge