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)
commitbf465de6c6b46441b30bed37e2658921ffc38ade
treea804af740345f9a598864914d0e796d0e279b7bc
parent3111bd808dfc89af98b77f4b84cfef9ca58704c2
parentf2f1974152496fd66f8122d8c0ae0843987c45fc
Merge branch 'master' into dmacvicar_aria