Merge branch 'aria'
authorDuncan Mac-Vicar P <dmacvicar@suse.de>
Fri, 20 Feb 2009 13:51:17 +0000 (14:51 +0100)
committerDuncan Mac-Vicar P <dmacvicar@suse.de>
Fri, 20 Feb 2009 13:51:17 +0000 (14:51 +0100)

Trivial merge