Merge with mainline changes.
commit736b07b371eff9ddb7417f9783783a70634cebb4
authorManuele Conti <conti.ma@alice.it>
Mon, 29 Jul 2013 15:17:21 +0000 (29 17:17 +0200)
committerManuele Conti <conti.ma@alice.it>
Mon, 29 Jul 2013 15:17:21 +0000 (29 17:17 +0200)
tree28fddeda4638c2b4140b53b397e62db08d6aa76a
parent3dd148d953c70e48d8af23bcc31daae517c34b27
parentd856110eaa64106e15a328eeed1b46c3d264e012
Merge with mainline changes.