[lazarus/el6/master: 7/7] Merge branch 'master' into el6

[Lubomir Rintel]

commit 253cd6d4d2e0f59fb0979c31b071109a862c2628
Merge: 8cf4a8d ea1ec02
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Sun Dec 5 12:50:38 2010 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	lazarus.spec

 lazarus.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---