Merge mainline changes
commit9ad289db625ec899a8601867483d89b8354a0f81
authorMaurizio Lombardi <m.lombardi85@gmail.com>
Sat, 23 Feb 2013 14:04:55 +0000 (23 15:04 +0100)
committerMaurizio Lombardi <m.lombardi85@gmail.com>
Sat, 23 Feb 2013 14:04:55 +0000 (23 15:04 +0100)
treef0428a459a2fa0761043d004491f1999d58ef30d
parent3acd1bbbc798671d0d42673c2e902088d0f5ecd8
parentdf64dbcec09ca6420de2c8c0944a17482cc56d6b
Merge mainline changes