Merge branch 'packaging' into vanilla
authorMichal Marek <mmarek@suse.cz>
Tue, 5 Mar 2013 20:45:04 +0000 (21:45 +0100)
committerMichal Marek <mmarek@suse.cz>
Tue, 5 Mar 2013 20:45:04 +0000 (21:45 +0100)
commit64719de18284461872ea9814810a71dbde5be19c
treea7e19264e521761a7bacd46435441aae08b1d32f
parentecbda0bce99f06263f601662870b3dae83037fed
parent26431d8a95261c299e6c4f8f2c7d760a263c7893
Merge branch 'packaging' into vanilla