[leksah-server/f18: 6/6] merge master

[Jens Petersen]

commit c1fd839d20cbe17cefc31fb9bd47127fc97dc3f3
Merge: 8d55d11 1a6f8f9
Author: Jens Petersen <petersen at redhat.com>
Date:   Tue Dec 4 15:23:18 2012 +0900

    merge master

 leksah-server-no-threaded.patch |   11 ++++++++
 leksah-server.spec              |   51 +++++++++++++++++++++++----------------
 2 files changed, 41 insertions(+), 21 deletions(-)
---