[inchi: 15/16] Merge remote branch 'origin/el5/master'

[Dominik Mierzejewski]

commit dce28c6bff62eef6bad62cfce99ef629f57b99cd
Merge: 60b67ba 7b28605
Author: Dominik Mierzejewski <dominik at greysector.net>
Date:   Fri Dec 3 00:21:27 2010 +0100

    Merge remote branch 'origin/el5/master'
    
    Conflicts:
    	.gitignore

 .gitignore |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
---