Merge branch 'master' into harmattan
authorAlberto Mardegan <mardy@users.sourceforge.net>
Thu, 5 Aug 2010 13:31:20 +0000 (16:31 +0300)
committerAlberto Mardegan <mardy@users.sourceforge.net>
Thu, 5 Aug 2010 13:31:20 +0000 (16:31 +0300)
commitd0a5b51adba79923f70b96563768a50d782f0d93
tree3ce93742d8998c9992efc0e0ac18314f4d6fdbee
parent6505826f190d5dc31cffd423383cad2b69208f82
parentefe0c6aa8de4fd3020e08c71cada04e8174e0264
Merge branch 'master' into harmattan