merge mainline changes
commit3a0a4d8ea482cca2dea01afe851cb41de73b0ae6
authorMaurizio Lombardi <m.lombardi85@gmail.com>
Thu, 12 Sep 2013 07:54:05 +0000 (12 09:54 +0200)
committerMaurizio Lombardi <m.lombardi85@gmail.com>
Thu, 12 Sep 2013 07:54:05 +0000 (12 09:54 +0200)
treea1ca4e53d91646a2ae13e20a677a6939b0c9a9d3
parent47f5a77e54b080e84a8ca77e44a64a2d1f4731dd
parent64f3d3b30214b99ffdce5634420154819c802b37
merge mainline changes