[cmake/f15/master: 3/3] Merge branch 'master' into f15

[Orion Poplawski]

commit 495ea7ad11dad59b725f8ce3e42c76d54249688a
Merge: a69646e bfbe8d8
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu Mar 31 08:22:25 2011 -0600

    Merge branch 'master' into f15

 cmake.spec |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---