Merge branch 'master' into harmattan
authorAlberto Mardegan <mardy@users.sourceforge.net>
Fri, 13 Aug 2010 12:40:46 +0000 (15:40 +0300)
committerAlberto Mardegan <mardy@users.sourceforge.net>
Fri, 13 Aug 2010 12:40:46 +0000 (15:40 +0300)
commit3ebad3abcf50eabcf83bc9d33fab70a90e1a10ce
tree644b96da5d81e977de69d1de88bf7d0ce94e9aa6
parentd585dd90ef783d43873d3c5c6fe9817fa2d0a617
parentcd1d6994b72e0ac4eb427cdb22e4ccea4c3710db
Merge branch 'master' into harmattan