[cave9: 3/4] Merge branch 'master' into f13

[Victor Bogado da Silva Lins]

commit d188b468ce6e69fac87b83f36b695dcd78cb205e
Merge: 3d0d1e3 ff1746b
Author: Victor Bogado <victor at bogado.net>
Date:   Wed Aug 4 15:48:36 2010 -0300

    Merge branch 'master' into f13

 cave9.spec |   11 +++++++----
 sources    |    1 +
 2 files changed, 8 insertions(+), 4 deletions(-)
---