[gliv/f13/master: 2/2] Merge branch 'master' into f13/master

[Peter Lemenkov]

commit c291e9765fc26d9d45fb9fca9dd33ce09b36db96
Merge: 3f88657 8de86d7
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sat Jan 15 14:38:20 2011 +0300

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

 .gitignore                                         |    2 +
 ...t-with-NULL-returned-from-get_terminal_ou.patch |   46 --------------------
 gliv.spec                                          |   19 ++++++---
 sources                                            |    2 +-
 4 files changed, 16 insertions(+), 53 deletions(-)
---