Merge branch 'sfabbro-ldflags' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Sat, 27 Jul 2013 15:03:07 +0000 (23:03 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Sat, 27 Jul 2013 15:03:07 +0000 (23:03 +0800)

Trivial merge