tree c2c130a74be25b0b2dff992e1a195e2728bdaadd
parent fd0961ff67727482bb20ca7e8ea97b83e9de2ddb
parent 7e27d6e778cd87b6f2415515d7127eba53fe5d02
author Jiri Kosina <jkosina@suse.cz> 1276704493 +0200
committer Jiri Kosina <jkosina@suse.cz> 1276704493 +0200

Merge branch 'master' into for-next