merge from trunk
commitef064bb6241bc76840ebf5875d6e6a4c0e8003a2
authorJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 18:47:01 +0000 (11 20:47 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 18:47:01 +0000 (11 20:47 +0200)
tree26369031ff4511f26c650b8c3dbacf9bb943ff81
parentf20bcfe4144569d46d5e25685456af50820719f7
parentaab6e902f93767b1ade593dff7ddfccd159124a6
merge from trunk