| commit | 73e6d6c6467771838c1fc6949e6768a12ed72464 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Fri Sep 24 14:03:37 2010 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Fri Sep 24 14:03:37 2010 +0200 |
| tree | 94dd60891869a0a275cd332c4e675cf0b101fcfa | |
| parent | 12e5272585901217e919da810c801e5084ee0cb1 [diff] | |
| parent | a850ea30374ebed32a0724742601861853fde869 [diff] |
Merge branch 'master' into upstream