cf30857 update to latest git snapshot

Authored and Committed by leigh123linux 11 years ago
    update to latest git snapshot
    
    - drop patch
    - remove gconf bits