Merge mainline changes
commit17cc8f4f7ca39b859a63ea05d5105d4300f84a27
authorMaurizio Lombardi <m.lombardi85@gmail.com>
Sun, 13 Jan 2013 14:59:32 +0000 (13 15:59 +0100)
committerMaurizio Lombardi <m.lombardi85@gmail.com>
Sun, 13 Jan 2013 14:59:32 +0000 (13 15:59 +0100)
treefc7a69488854971df60d3418f9aa8dd5c53bc9de
parente1a27be353631edb2bc89c1ec25378d233b4d07e
parentb5a3b50c5e0e757d7f292db4541d06a2e1c042d6
Merge mainline changes