merge mainline changes
commit47f5a77e54b080e84a8ca77e44a64a2d1f4731dd
authorMaurizio Lombardi <m.lombardi85@gmail.com>
Wed, 17 Jul 2013 08:46:06 +0000 (17 10:46 +0200)
committerMaurizio Lombardi <m.lombardi85@gmail.com>
Wed, 17 Jul 2013 08:46:06 +0000 (17 10:46 +0200)
tree9b80739c8a7a8e0961b4bd2a2fe53035cbffb40f
parentcdc3afaf697503234a75137371d2e29fba5f79a9
parent1d94e2155b4f5c86363ef8e3d6b3ceb0827e95ff
merge mainline changes