[cherokee/f14: 43/43] Merge branch 'master' into f14

[Pavel Lisý]

commit 8705c5ce1a527dc74b645f8f55b73b565010472b
Merge: 4fb6376 f91c349
Author: Pavel Lisý <pali at fedoraproject.org>
Date:   Wed Sep 14 12:17:57 2011 +0200

    Merge branch 'master' into f14

 .gitignore    |    3 ++-
 cherokee.spec |   19 +++++++++++++------
 sources       |    1 +
 3 files changed, 16 insertions(+), 7 deletions(-)
---