[wings/f12/master: 5/5] Merge branch 'master' into f12/master

[Peter Lemenkov]

commit a1b9b4244f972fc7f27177ae1cb2986d3f5a0daa
Merge: fc9ba2e c28de58
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Nov 16 17:53:38 2010 +0300

    Merge branch 'master' into f12/master
    
    Conflicts:
    	.gitignore
    	sources
    	wings.sh
    	wings.spec

 sources    |    2 +-
 wings.sh   |    2 +-
 wings.spec |    8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)
---