[pkg-fso-commits] [SCM] freesmartphone.org demo GUI branch, debian, updated. debian/0-git20090610-7-54-gfa9fbc5

[Timo Jyrinki]

The following commit has been merged in the debian branch:
commit fa9fbc53eae74bdb834271670e39a7159ea34d86
Merge: 8a0f3f7156eb50d28502c7c8a1cacafa3ef02ca2 6bcb7fc4d2ceffc327ab890ceda4845130546d83
Author: Timo Jyrinki <timo.jyrinki at nomovok.com>
Date:   Mon Apr 11 17:29:30 2011 +0300

    Merge branch 'master' into debian
    
    Conflicts:
    	data/themes/toby/zhone.edc
    	setup.py
    	src/zhone


-- 
freesmartphone.org demo GUI