[gliv/f12/master: 4/4] Merge branch 'master' into f12/master

[Peter Lemenkov]

commit fa8d0a91eba8b82e2769249facccb8c9e792b5bd
Merge: 8ef354e 65ebc0a
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Mon Aug 30 15:35:36 2010 +0400

    Merge branch 'master' into f12/master
    
    Conflicts:
    	.gitignore

 ...t-with-NULL-returned-from-get_terminal_ou.patch |   46 +++++++++++++
 gliv.applications                                  |   10 +++
 gliv.desktop                                       |   11 +++
 gliv.spec                                          |   71 +++++++------------
 4 files changed, 93 insertions(+), 45 deletions(-)
---