merge from trunk
commit98b421872a0894ff860ac6284cd077c96475de1a
authorJoakim Verona <joakim@verona.se>
Thu, 22 Aug 2013 04:21:28 +0000 (22 06:21 +0200)
committerJoakim Verona <joakim@verona.se>
Thu, 22 Aug 2013 04:21:28 +0000 (22 06:21 +0200)
tree56375a20f7c72bffe0831707d7cebcd0b2081ade
parentf07c6c2676516f1da78e473844d24b3b53a47170
parentd0fcaff514d2be16ccf73817f658318cf85221e3
merge from trunk