[gts/el6: 2/2] Merge branch 'master' into el6

[Jonathan G. Underwood]

commit 8bb5ec4f4ea87cec1990f3d0902ee42f5c026811
Merge: 366b872 40c91f0
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date:   Thu Dec 8 23:12:01 2011 +0000

    Merge branch 'master' into el6

 .gitignore                |    1 -
 gts-snapshot-111025.patch | 1461 +++++++++++++++++++++++++++++++++++++++++++++
 gts.spec                  |   38 +-
 3 files changed, 1485 insertions(+), 15 deletions(-)
---