Merge mainline changes
commit39aa8ced119bf7e09823acd7771b7350177a3149
authorMaurizio Lombardi <m.lombardi85@gmail.com>
Thu, 16 Feb 2012 22:16:18 +0000 (16 23:16 +0100)
committerMaurizio Lombardi <m.lombardi85@gmail.com>
Thu, 16 Feb 2012 22:16:18 +0000 (16 23:16 +0100)
tree49e0e4e5600b193e89c4a0e5e5375147cce404e5
parent9744f2d9eba439e6ebe03dfc30d5e8c753bafc09
parentc01bb5f96a155bdec60146b151e214e7cd17f2c4
Merge mainline changes