[numad: 5/5] Merge branch 'master' into f17 so they have the same history.

[jsynacek]

commit 853e23774142ec749decf9bbd94546ac3dc0a3b2
Merge: a7c268d e804b59
Author: Jan Synacek <jsynacek at redhat.com>
Date:   Wed May 23 08:21:51 2012 +0200

    Merge branch 'master' into f17 so they have the same history.

 numad.spec |    5 ++++-
 sources    |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
---