Merge branch 'master' into test
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Fri, 25 Mar 2011 14:04:39 +0000 (16:04 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Fri, 25 Mar 2011 14:04:39 +0000 (16:04 +0200)
commit123cb621590d4e51c2989fe464e4a39a8f5dc533
tree4499f416c044726844a08a2d7c285031e6b82224
parent28ebaabdbd0d0081a87134b398a66a8ff83e9088
parent2dc01c73749b02a915def97ecdf9d56b162644e1
Merge branch 'master' into test