Merge commit 'bcd9d42' into stable
authorJiri Slaby <jslaby@suse.cz>
Mon, 4 Feb 2013 14:35:47 +0000 (15:35 +0100)
committerJiri Slaby <jslaby@suse.cz>
Mon, 4 Feb 2013 14:35:47 +0000 (15:35 +0100)
commit4a1b9ba0c3faf726e54574a5754e13b07c50ea95
tree20be4dfe09af6fdd27fe852f644b1766c3812adc
parente93cd151277af75e7646144331eb5114153d7c33
parentbcd9d4293699be967d9be5118331acbb1355b720
Merge commit 'bcd9d42' into stable

Conflicts:
rpm/config.sh
rpm/config.sh