Merge branch 'master' into mgorse
authorMike Gorse <mgorse@novell.com>
Fri, 6 Nov 2009 19:45:49 +0000 (14:45 -0500)
committerMike Gorse <mgorse@novell.com>
Fri, 6 Nov 2009 19:45:49 +0000 (14:45 -0500)
commit23e1fbe67ae5d62868e64aa60b6807c6bc120f6a
tree6c304af3176321780db1adcae1657775445142b5
parentb81654c1ff0e2602963d8cdec23f910458486801
parentbeccc6ec73af048833f1b95b4b7e6e29cfabce13
Merge branch 'master' into mgorse