Merge branch 'lucian'
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 7 Dec 2010 09:33:52 +0000 (11:33 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 7 Dec 2010 09:33:52 +0000 (11:33 +0200)
commitf515cdc0f8abe78f92207087045e8131ea36d5a4
tree4df4519a18b46eaf52ca7cc11621908a68b90615
parentd6fcb4c4a08865c1ff053bc6a4017d2c3c386cdf
parent7a2b58fcb1937582ce665f0e159a553e78f0b7b7
Merge branch 'lucian'