[routino/el6: 2/2] Merge branch 'master' into el6

[Volker Fröhlich]

commit 6eac7bc95bc7018aeb53a3a52be1bd65575e22b4
Merge: bed85ce 0199e73
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Mon Aug 8 08:28:39 2011 +0200

    Merge branch 'master' into el6

 .gitignore   |    1 +
 routino.spec |    5 ++++-
 sources      |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---