merge from trunk
commit042cbea14ec32d91ccb99115f81814f508b8603b
authorJoakim Verona <joakim@verona.se>
Fri, 13 Sep 2013 16:25:42 +0000 (13 18:25 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 13 Sep 2013 16:25:42 +0000 (13 18:25 +0200)
tree0522f2c7cfd7c38e8899d9254be1a7ee8328f747
parentfda7ba7c422a8d5a5827e33bb1c800778790955f
parentbc2c0769db73f5acd7545b4c3f74cae29e4e4315
merge from trunk