Merge branch 'master' into dmacvicar_aria
authorDuncan Mac-Vicar P <dmacvicar@suse.de>
Fri, 13 Feb 2009 14:12:51 +0000 (15:12 +0100)
committerDuncan Mac-Vicar P <dmacvicar@suse.de>
Fri, 13 Feb 2009 14:12:51 +0000 (15:12 +0100)

Trivial merge