Merge pull request #4642 from wsnipex/linking-fix 13.0-Gotham
authorjmarshallnz <jcmarsha@gmail.com>
Sat, 3 May 2014 21:03:25 +0000 (09:03 +1200)
committerjmarshallnz <jcmarsha@gmail.com>
Sat, 3 May 2014 21:03:25 +0000 (09:03 +1200)
Linking fix [fixes #15139]


Trivial merge