[ugene/f17: 2/2] Merge branch 'master' into f17

[Peter Lemenkov]

commit bd8edb0ee3e8d4c46dfef9808079ad825afc9ab4
Merge: 81106f0 5ee199c
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sat Dec 1 13:58:04 2012 +0400

    Merge branch 'master' into f17

 ugene.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---