[atasm/el6/master: 4/4] Merge branch 'master' into el6

[Dan Horák]

commit 1109488dda387cd2d700cc2f727edcf5d32c7b04
Merge: fca66b0 5f5bc78
Author: Dan Horák <dan at danny.cz>
Date:   Thu Oct 14 22:34:53 2010 +0200

    Merge branch 'master' into el6

 atasm.spec |   21 ++++++++++++---------
 sources    |    2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)
---