Merge mainline changes
commit3df290792b980ae2873195fbf00acafa0d94b3dc
authorMaurizio Lombardi <m.lombardi85@gmail.com>
Mon, 27 Feb 2012 12:58:00 +0000 (27 13:58 +0100)
committerMaurizio Lombardi <m.lombardi85@gmail.com>
Mon, 27 Feb 2012 12:58:00 +0000 (27 13:58 +0100)
treefaa268c8abcfaa50bac368b4c64c8608e8247054
parent09c954ba81b1fc857478c0408ed2e59077744202
parentb64fbc9fdd4c146668b26c5ab85a174bea2e1e9e
Merge mainline changes