[gdl/f15: 5/5] Merge branch 'master' into f15

[Orion Poplawski]

commit 1127a4bf6f7877ffed735bd40f029756bc572ecf
Merge: 819cf00 19303c6
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Sat Jan 7 10:30:40 2012 -0700

    Merge branch 'master' into f15

 gdl.spec |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---