merge mainline changes
commitb5ba8f6bf68a938553e7261a2c0285ce7d24fd7f
authorMaurizio Lombardi <m.lombardi85@gmail.com>
Fri, 13 Sep 2013 13:11:53 +0000 (13 15:11 +0200)
committerMaurizio Lombardi <m.lombardi85@gmail.com>
Fri, 13 Sep 2013 13:11:53 +0000 (13 15:11 +0200)
tree88671a8fab8a7daaa5cf428ce761be6f10caf587
parent95027b5e4afecf09d5507961dd868a6191912ee9
parent1c5f6f89a7f9369cad027309170969714d0639a7
merge mainline changes