Merge remote-tracking branch 'ivan/bug/3606_make-base-config-test-pass' into develop
authorTomás Touceda <chiiph@leap.se>
Fri, 30 Aug 2013 17:45:31 +0000 (14:45 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 30 Aug 2013 17:45:31 +0000 (14:45 -0300)

Trivial merge