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)
commit2c7a9a92637eb794fda76678f186f1ab4fa2ecbe
tree4228562c4ce173ef90063ce8425bd0f80e5c0caf
parent375017af47244dd5ed27eddbccc252f9545cae5a
parentf276f8fc3cf8a543466523b94c91b8cb1035556f
Merge branch 'aria'