[atasm/f13/master: 3/3] Merge branch 'master' into f13

[Dan Horák]

commit b015f3e571f4c0f993f9b497440d7e3bf99ffed5
Merge: 9bd0eb9 5f5bc78
Author: Dan Horák <dan at danny.cz>
Date:   Thu Oct 14 22:36:24 2010 +0200

    Merge branch 'master' into f13

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