fixed something
(cherry picked from commit 9307d6189fcb1030187ad96af5e2272463daf99a)
Merge branch 'fuerte-devel' into fuerte